Browse Source

Migrate container from Alpine to Debian

Agus Lopez 1 năm trước cách đây
mục cha
commit
b7f1755fa2
2 tập tin đã thay đổi với 9 bổ sung6 xóa
  1. 1 1
      .github/workflows/docker-publish.yml
  2. 8 5
      Dockerfile

+ 1 - 1
.github/workflows/docker-publish.yml

@@ -20,7 +20,7 @@ on:
   workflow_dispatch:
 
 env:
-  IMAGE_BASE: library/alpine:latest
+  IMAGE_BASE: library/debian:stable-slim
   REPO_NAME: ${{ github.event.repository.name }}
   REGISTRY_URL: ${{ github.event_name != 'pull_request' &&
                     'docker.io' ||

+ 8 - 5
Dockerfile

@@ -1,10 +1,13 @@
-ARG BASE_IMAGE=library/alpine:latest
+ARG BASE_IMAGE=library/debian:stable-slim
 
 FROM docker.io/${BASE_IMAGE}
 
 RUN \
-  apk add --update --no-cache tor curl \
-  && rm -rf /var/cache/apk/*
+  apt-get update && \
+  env DEBIAN_FRONTEND=noninteractive \
+  apt-get install -y --no-install-recommends tor curl \
+  -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
+  && apt-get clean && rm -rf /var/lib/apt/lists/* /var/lib/apt/lists/*
 
 COPY torrc /etc/tor/torrc
 
@@ -13,7 +16,7 @@ EXPOSE 9050/tcp
 HEALTHCHECK --interval=5m --timeout=5s \
   CMD timeout 2 curl -sfo /dev/null --socks5-hostname 127.0.0.1:9050 'https://check.torproject.org'
 
-USER tor
+USER debian-tor
 
-ENTRYPOINT ["/usr/bin/tor"]
+ENTRYPOINT ["/usr/sbin/tor"]
 CMD ["-f", "/etc/tor/torrc"]