Merge pull request #36 from essentialkaos/develop

Version 0.0.5
essentialkaos · Feb 26, 2023 · 71b5c81 · 71b5c81
2 parents cae59b8 + 7ea0d93
commit 71b5c81
Show file tree

Hide file tree

Showing 11 changed files with 728 additions and 472 deletions.
diff --git a/Dockerfile → .docker/alpine.docker b/Dockerfile → .docker/alpine.docker
@@ -1,3 +1,7 @@
+## REGISTRY CONFIGURATION ######################################################
+
+ARG REGISTRY="docker.io"
+
 ## BUILDER #####################################################################
 
 FROM golang:alpine as builder
@@ -6,17 +10,12 @@ WORKDIR /go/src/github.com/essentialkaos/rsz
 
 COPY . .
 
-ENV GO111MODULE=auto
-
 # hadolint ignore=DL3018
-RUN apk add --no-cache git make upx && \
-    make deps && \
-    make all && \
-    upx rsz
+RUN apk add --no-cache git make && make deps && make all
 
 ## FINAL IMAGE #################################################################
 
-FROM essentialkaos/alpine:3.13
+FROM ${REGISTRY}/essentialkaos/alpine:3.15
 
 LABEL org.opencontainers.image.title="rsz" \
       org.opencontainers.image.description="Simple utility for image resizing" \

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -4,9 +4,7 @@ _Before opening an issue, search for similar bug reports or feature requests on
 
 **System info:**
 
-* **Version used (`rsz --version`):** 
-* **OS (e.g. from `/etc/*-release`):** 
-* **Kernel (`uname -a`):** 
+* **Verbose version info (`rsz -vv`):** 
 * **Install tools:** 
 
 **Steps to reproduce:**

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        go: [ '1.17.x', '1.18.x' ]
+        go: [ '1.19.x', '1.20.x' ]
 
     steps:
       - name: Set up Go
@@ -54,7 +54,7 @@ jobs:
       - name: Check dockerfiles with Hadolint
         uses: essentialkaos/hadolint-action@v1
         with:
-          files: Dockerfile
+          files: .docker/*.docker
 
   DockerBuild:
     name: Docker Build Check
@@ -63,8 +63,11 @@ jobs:
     needs: Hadolint
 
     env:
-      DOCKER_FILE: Dockerfile
-      IMAGE_NAME: rsz
+      REGISTRY: ghcr.io
+
+    strategy:
+      matrix:
+        image: [ 'alpine' ]
 
     steps:
       - name: Check event type
@@ -100,11 +103,11 @@ jobs:
       - name: Build Docker image
         if: ${{ github.event_name == 'pull_request' }}
         run: |
-          docker build -f ${{ env.DOCKER_FILE }} -t ${{ env.IMAGE_NAME }} .
+          docker build --build-arg REGISTRY=${REGISTRY} -f .docker/${{matrix.image}}.docker -t ${{matrix.image}} .
 
       - name: Show info about built Docker image
         uses: essentialkaos/docker-info-action@v1
         if: ${{ github.event_name == 'pull_request' }}
         with:
-          image: ${{ env.IMAGE_NAME }}
+          image: ${{matrix.image}}
           show-labels: true
diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
@@ -3,6 +3,13 @@ name: "Docker Push"
 on:
   release:
     types: [published]
+  workflow_dispatch:
+    inputs:
+      force_rebuild:
+        description: 'Force container rebuild'
+        required: true
+        type: choice
+        options: [yes, no]
   schedule:
     - cron: '30 12 * * *'
 
@@ -18,6 +25,9 @@ jobs:
     name: Docker Build & Publish
     runs-on: ubuntu-latest
 
+    env:
+      DOCKER_FILE: alpine
+
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -63,17 +73,17 @@ jobs:
             exit 1
           fi
 
-          docker_file="Dockerfile"
-          base_image=$(grep 'FROM ' $docker_file | tail -1 | cut -f2 -d' ')
+          docker_file=".docker/${{env.DOCKER_FILE}}.docker"
+          base_image=$(grep 'FROM ' $docker_file | grep -v 'builder' | sed 's#${REGISTRY}/##' | tail -1 | cut -f2 -d' ')
 
           if [[ -z "$base_image" ]] ; then
             echo "::error::Can't extract base image info"
             exit 1
           fi
 
-          echo "::set-output name=version::$version"
-          echo "::set-output name=dockerfile::$docker_file"
-          echo "::set-output name=baseimage::$base_image"
+          echo "version=$version" >> $GITHUB_OUTPUT
+          echo "dockerfile=$docker_file" >> $GITHUB_OUTPUT
+          echo "baseimage=$base_image" >> $GITHUB_OUTPUT
 
           echo -e "\033[34mVersion:\033[0m    $version"
           echo -e "\033[34mDockerfile:\033[0m $docker_file"
@@ -83,7 +93,13 @@ jobs:
         id: build_check
         run: |
           if [[ "${{github.event_name}}" == "release" ]] ; then
-            echo "::set-output name=build::true"
+            echo "build=true" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          if [[ "${{ github.event.inputs.force_rebuild }}" == "true" ]] ; then
+            echo "::warning::Rebuild is required (reason: forced rebuild)"
+            echo "build=true" >> $GITHUB_OUTPUT
             exit 0
           fi
 
@@ -113,24 +129,38 @@ jobs:
 
           if ! docker inspect "ghcr.io/${{env.IMAGE_NAME}}:latest" | jq -r '.[0].RootFS.Layers' | grep -q "$base_layer" ; then
             echo "::warning::Rebuild image (reason: base image rebuilt)"
-            echo "::set-output name=build::true"
+            echo "build=true" >> $GITHUB_OUTPUT
             exit 0
           fi
 
-      - name: Build and push Docker image
+      - name: Build and push Docker images (Docker)
         if: ${{ steps.build_check.outputs.build == 'true' }}
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           push: true
           context: .
           file: ${{steps.metadata.outputs.dockerfile}}
+          build-args: |
+            REGISTRY=docker.io
           tags: |
-            ghcr.io/${{env.IMAGE_NAME}}:${{steps.metadata.outputs.version}}
-            ghcr.io/${{env.IMAGE_NAME}}:latest
             ${{env.IMAGE_NAME}}:${{steps.metadata.outputs.version}}
             ${{env.IMAGE_NAME}}:latest
 
+      - name: Build and push Docker images (GHCR)
+        if: ${{ steps.build_check.outputs.build == 'true' }}
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          context: .
+          file: ${{steps.metadata.outputs.dockerfile}}
+          build-args: |
+            REGISTRY=ghcr.io
+          tags: |
+            ghcr.io/${{env.IMAGE_NAME}}:${{steps.metadata.outputs.version}}
+            ghcr.io/${{env.IMAGE_NAME}}:latest
+
       - name: Show info about built Docker image
+        if: ${{ steps.build_check.outputs.build == 'true' }}
         uses: essentialkaos/docker-info-action@v1
         with:
           image: ghcr.io/${{env.IMAGE_NAME}}:latest

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 ################################################################################
 
-# This Makefile generated by GoMakeGen 2.0.0 using next command:
+# This Makefile generated by GoMakeGen 2.2.0 using next command:
 # gomakegen --mod .
 #
 # More info: https://kaos.sh/gomakegen
@@ -13,6 +13,9 @@ ifdef VERBOSE ## Print verbose information (Flag)
 VERBOSE_FLAG = -v
 endif
 
+MAKEDIR = $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+GITREV ?= $(shell test -s $(MAKEDIR)/.git && git rev-parse --short HEAD)
+
 ################################################################################
 
 .DEFAULT_GOAL := help
@@ -23,7 +26,7 @@ endif
 all: rsz ## Build all binaries
 
 rsz:
-	go build $(VERBOSE_FLAG) rsz.go
+	go build $(VERBOSE_FLAG) -ldflags="-X main.gitrev=$(GITREV)" rsz.go
 
 install: ## Install all binaries
 	cp rsz /usr/bin/rsz
@@ -65,13 +68,13 @@ else
 	go mod tidy $(VERBOSE_FLAG)
 endif
 
-	test -d vendor && go mod vendor $(VERBOSE_FLAG) || :
+	test -d vendor && rm -rf vendor && go mod vendor $(VERBOSE_FLAG) || :
 
 mod-download:
 	go mod download
 
 mod-vendor:
-	go mod vendor $(VERBOSE_FLAG)
+	rm -rf vendor && go mod vendor $(VERBOSE_FLAG)
 
 fmt: ## Format source code with gofmt
 	find . -name "*.go" -exec gofmt -s -w {} \;
@@ -91,6 +94,6 @@ help: ## Show this info
 		| sed 's/ifdef //' \
 		| awk 'BEGIN {FS = " .*?## "}; {printf "  \033[32m%-14s\033[0m %s\n", $$1, $$2}'
 	@echo -e ''
-	@echo -e '\033[90mGenerated by GoMakeGen 2.0.0\033[0m\n'
+	@echo -e '\033[90mGenerated by GoMakeGen 2.2.0\033[0m\n'
 
 ################################################################################
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@
 
 #### From source
 
-To build the `rsz` from scratch, make sure you have a working Go 1.17+ workspace (_[instructions](https://golang.org/doc/install)_), then:
+To build the `rsz` from scratch, make sure you have a working Go 1.19+ workspace (_[instructions](https://golang.org/doc/install)_), then:
 
 ```
 go install github.com/essentialkaos/rsz@latest