Skip to content

fix(docker): fixes tor-onionbalance-manager build and other dockerfile syntax warnings #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bugfest merged 1 commit into from
Dec 30, 2024
Merged

fix(docker): fixes tor-onionbalance-manager build and other dockerfile syntax warnings #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.tor-daemon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions Dockerfile.tor-daemon-manager
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand Down
18 changes: 9 additions & 9 deletions Dockerfile.tor-onionbalance-manager
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand Down
Loading