diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd5b448..030e6f1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.16.0 + go-version: 1.16.2 - name: Check out code uses: actions/checkout@v2 @@ -67,9 +67,11 @@ jobs: - name: Check out code uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 # Action page: + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 # Action page: - id: buildx - name: Docker login in default registry run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_LOGIN }}" --password-stdin @@ -84,11 +86,12 @@ jobs: - name: Build image run: | docker buildx build \ - --platform ${{ steps.buildx.outputs.platforms }} \ + --platform "linux/amd64,linux/386,linux/arm64,linux/arm/v6,linux/arm/v7" \ --tag "tarampampam/mikrotik-hosts-parser:${{ steps.values.outputs.version }}" \ --tag "tarampampam/mikrotik-hosts-parser:latest" \ --tag "ghcr.io/tarampampam/mikrotik-hosts-parser:${{ steps.values.outputs.version }}" \ --tag "ghcr.io/tarampampam/mikrotik-hosts-parser:latest" \ --build-arg "APP_VERSION=${{ steps.values.outputs.version }}" \ + --file ./Dockerfile \ --push \ . diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 58a6a49..450ae1e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -54,7 +54,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.16.0 + go-version: 1.16.2 - name: Check out code uses: actions/checkout@v2 @@ -99,7 +99,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.16.0 + go-version: 1.16.2 - name: Check out code uses: actions/checkout@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f57451..9f4093a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver]. +## v4.2.0 + +### Changed + +- Go version updated from `1.16.0` up to `1.16.2` + +### Added + +- Support for `linux/arm64`, `linux/arm/v6` and `linux/arm/v7` platforms for docker image + ## v4.1.0 ### Changed diff --git a/Dockerfile b/Dockerfile index 3ad1bbf..5d41983 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1.2 # Image page: -FROM --platform=${TARGETPLATFORM:-linux/amd64} golang:1.16.0-alpine as builder +FROM --platform=${TARGETPLATFORM:-linux/amd64} golang:1.16.2-alpine as builder # can be passed with any prefix (like `v1.2.3@GITHASH`) # e.g.: `docker build --build-arg "APP_VERSION=v1.2.3@GITHASH" .` diff --git a/docker-compose.yml b/docker-compose.yml index c5230f9..bd28709 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ volumes: services: app: &app-service - image: golang:1.16.0-buster # Image page: + image: golang:1.16.2-buster # Image page: working_dir: /src environment: HOME: /tmp