diff --git a/Dockerfile b/Dockerfile index 801cf1e..def09d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.20 as builder +FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.20 AS builder WORKDIR /src diff --git a/Dockerfile.tor-daemon b/Dockerfile.tor-daemon index 33ae344..a966ab5 100644 --- a/Dockerfile.tor-daemon +++ b/Dockerfile.tor-daemon @@ -1,4 +1,4 @@ ARG TOR_VERSION="0.4.8.9-r1" ARG TOR_IMAGE="quay.io/bugfest/tor" -FROM ${TOR_IMAGE}:${TOR_VERSION} as tor +FROM ${TOR_IMAGE}:${TOR_VERSION} AS tor diff --git a/Dockerfile.tor-daemon-manager b/Dockerfile.tor-daemon-manager index 6c68b3a..d39e7b6 100644 --- a/Dockerfile.tor-daemon-manager +++ b/Dockerfile.tor-daemon-manager @@ -1,7 +1,7 @@ ARG TOR_VERSION="0.4.8.9-r1" ARG TOR_IMAGE="quay.io/bugfest/tor" -FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.20 as builder +FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.20 AS builder WORKDIR /src @@ -13,7 +13,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/go/pkg \ CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -a -ldflags="-s -w" -o /out/tor-local-manager ./agents/tor/main.go -FROM ${TOR_IMAGE}:${TOR_VERSION} as tor +FROM ${TOR_IMAGE}:${TOR_VERSION} AS tor RUN mkdir -p /app COPY --from=builder --chmod=0555 /out/tor-local-manager /app diff --git a/Dockerfile.tor-onionbalance-manager b/Dockerfile.tor-onionbalance-manager index 9d58dae..f4ee2ea 100644 --- a/Dockerfile.tor-onionbalance-manager +++ b/Dockerfile.tor-onionbalance-manager @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.20 as builder +FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.20 AS builder WORKDIR /src @@ -11,17 +11,17 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -a -ldflags="-s -w" -o /out/onionbalance-local-manager ./agents/onionbalance/main.go # package build -FROM docker.io/library/alpine:3.17.2 +FROM docker.io/library/alpine:3.17.10 -ARG OB_VERSION="0.2.2" +ARG OB_VERSION="0.2.3" RUN apk add --no-cache --update \ - git=2.38.5-r0 \ - py3-cryptography=38.0.3-r1 \ - py3-pip=22.3.1-r1 \ - py3-pycryptodomex=3.15.0-r0 \ - py3-setproctitle=1.3.1-r0 \ - py3-wheel=0.38.4-r0 \ + git \ + py3-cryptography \ + py3-pip \ + py3-pycryptodomex \ + py3-setproctitle \ + py3-wheel \ && python3 -m pip install --no-cache-dir git+https://gitlab.torproject.org/tpo/core/onionbalance.git@${OB_VERSION} WORKDIR /app