Skip to content

Commit

Permalink
Merge pull request #59 from wallarm/fix/docker
Browse files Browse the repository at this point in the history
Update Dockerfile
  • Loading branch information
afr1ka authored Feb 11, 2023
2 parents 190d82a + 1c77129 commit d9f6d78
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
needs:
- draft-release
env:
X_GO_DISTRIBUTION: "https://go.dev/dl/go1.19.4.linux-amd64.tar.gz"
X_GO_DISTRIBUTION: "https://go.dev/dl/go1.19.5.linux-amd64.tar.gz"
strategy:
matrix:
include:
Expand Down Expand Up @@ -159,7 +159,7 @@ jobs:
needs:
- draft-release
env:
X_GO_VERSION: "1.19.4-r0"
X_GO_VERSION: "1.19.5-r0"
strategy:
matrix:
include:
Expand Down Expand Up @@ -262,17 +262,17 @@ jobs:
needs:
- draft-release
env:
X_GO_VERSION: "1.19.4-r0"
X_GO_VERSION: "1.19.5-r0"
strategy:
matrix:
include:
- arch: armv6
distro: bullseye
go_distribution: https://go.dev/dl/go1.19.4.linux-armv6l.tar.gz
go_distribution: https://go.dev/dl/go1.19.5.linux-armv6l.tar.gz
artifact: armv6-libc
- arch: aarch64
distro: bullseye
go_distribution: https://go.dev/dl/go1.19.4.linux-arm64.tar.gz
go_distribution: https://go.dev/dl/go1.19.5.linux-arm64.tar.gz
artifact: arm64-libc
- arch: armv6
distro: alpine_latest
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18-alpine3.16 AS build
FROM golang:1.19-alpine AS build

ARG APIFIREWALL_VERSION
ENV APIFIREWALL_VERSION=${APIFIREWALL_VERSION}
Expand All @@ -22,7 +22,7 @@ RUN go mod download -x && \
# Smoke test
RUN ./api-firewall -v

FROM alpine:3.16 AS composer
FROM alpine:3.17 AS composer

WORKDIR /output

Expand All @@ -32,7 +32,7 @@ COPY ./docker-entrypoint.sh ./usr/local/bin/docker-entrypoint.sh
RUN chmod 755 ./usr/local/bin/* && \
chown root:root ./usr/local/bin/*

FROM alpine:3.16
FROM alpine:3.17

RUN adduser -u 1000 -H -h /opt -D -s /bin/sh api-firewall

Expand Down

0 comments on commit d9f6d78

Please sign in to comment.