Commit a9a75511 authored by +flatcloud0b3's avatar +flatcloud0b3 💬
Browse files

Merge branch '_upgrade_OS' into 'master'

Upgrade base image os

See merge request !2
parents 356cf0a3 8c29858b
FROM debian:buster-slim FROM debian:11-slim
################################################################# #################################################################
......
FROM debian:buster-slim FROM debian:11-slim
################################################################# #################################################################
...@@ -6,10 +6,10 @@ FROM debian:buster-slim ...@@ -6,10 +6,10 @@ FROM debian:buster-slim
################################################################# #################################################################
ENV TOR_HOME /var/lib/tor ENV TOR_HOME /var/lib/tor
ENV TOR_PGP_SIG_URL https://github.com/flatcloud0b3/tor/releases/download/v0.4.6.7/tor-0.4.6.7-linux-gnu-ppc64le.deb.sig ENV TOR_PGP_SIG_URL https://github.com/flatcloud0b3/tor/releases/download/v0.4.6.7/tor-0.4.6.7-linux-gnu-ppc64le-bullseye.deb.sig
ENV TOR_DEB_URL https://github.com/flatcloud0b3/tor/releases/download/v0.4.6.7/tor-0.4.6.7-linux-gnu-ppc64le.deb ENV TOR_DEB_URL https://github.com/flatcloud0b3/tor/releases/download/v0.4.6.7/tor-0.4.6.7-linux-gnu-ppc64le-bullseye.deb
ENV TOR_SHA256 6ee4211e2217cc40fdfcad81b96a9b3188adc23eb4d68fb45b2c913abde1f714 ENV TOR_SHA256 844886ac03e50cdf385e8edf6e493a3acbb7d1c83fbdef57901b4cb2d3916fae
ENV TOR_DEB_SIG tor-0.4.6.7-linux-gnu-ppc64le.deb.sig ENV TOR_DEB_SIG tor-0.4.6.7-linux-gnu-ppc64le-bullseye.deb.sig
ENV FLATCLOUD_PGP_KEY E28D24AA6FE1AD3F6F258BA0D9CE2F6D968DDC54 ENV FLATCLOUD_PGP_KEY E28D24AA6FE1AD3F6F258BA0D9CE2F6D968DDC54
ENV PGP_KS_URL hkp://keyserver.ubuntu.com ENV PGP_KS_URL hkp://keyserver.ubuntu.com
...@@ -36,8 +36,8 @@ RUN cd /tmp && \ ...@@ -36,8 +36,8 @@ RUN cd /tmp && \
wget "$TOR_DEB_URL" && \ wget "$TOR_DEB_URL" && \
gpg --keyserver "$PGP_KS_URL" --recv-keys "$FLATCLOUD_PGP_KEY" && \ gpg --keyserver "$PGP_KS_URL" --recv-keys "$FLATCLOUD_PGP_KEY" && \
gpg --verify "$TOR_DEB_SIG" && \ gpg --verify "$TOR_DEB_SIG" && \
echo "$TOR_SHA256 tor-0.4.6.7-linux-gnu-ppc64le.deb" | sha256sum -c - && \ echo "$TOR_SHA256 tor-0.4.6.7-linux-gnu-ppc64le-bullseye.deb" | sha256sum -c - && \
dpkg -i tor-0.4.6.7-linux-gnu-ppc64le.deb && \ dpkg -i tor-0.4.6.7-linux-gnu-ppc64le-bullseye.deb && \
rm -rf /tmp/* rm -rf /tmp/*
# Install Golang & OBFS4 proxy # Install Golang & OBFS4 proxy
...@@ -88,4 +88,3 @@ EXPOSE 9050 ...@@ -88,4 +88,3 @@ EXPOSE 9050
# Switch to user tor # Switch to user tor
USER tor USER tor
FROM debian:buster-slim FROM debian:11-slim
ENV WHIRLPOOL_HOME /home/whirlpool ENV WHIRLPOOL_HOME /home/whirlpool
ENV WHIRLPOOL_DIR /usr/local/whirlpool-cli ENV WHIRLPOOL_DIR /usr/local/whirlpool-cli
...@@ -25,10 +25,10 @@ RUN set -ex && \ ...@@ -25,10 +25,10 @@ RUN set -ex && \
mkdir -p "$WHIRLPOOL_DIR" mkdir -p "$WHIRLPOOL_DIR"
# Install Tor # Install Tor
ENV TOR_PGP_SIG_URL https://github.com/flatcloud0b3/tor/releases/download/v0.4.6.7/tor-0.4.6.7-linux-gnu-ppc64le.deb.sig ENV TOR_PGP_SIG_URL https://github.com/flatcloud0b3/tor/releases/download/v0.4.6.7/tor-0.4.6.7-linux-gnu-ppc64le-bullseye.deb.sig
ENV TOR_DEB_URL https://github.com/flatcloud0b3/tor/releases/download/v0.4.6.7/tor-0.4.6.7-linux-gnu-ppc64le.deb ENV TOR_DEB_URL https://github.com/flatcloud0b3/tor/releases/download/v0.4.6.7/tor-0.4.6.7-linux-gnu-ppc64le-bullseye.deb
ENV TOR_SHA256 6ee4211e2217cc40fdfcad81b96a9b3188adc23eb4d68fb45b2c913abde1f714 ENV TOR_SHA256 844886ac03e50cdf385e8edf6e493a3acbb7d1c83fbdef57901b4cb2d3916fae
ENV TOR_DEB_SIG tor-0.4.6.7-linux-gnu-ppc64le.deb.sig ENV TOR_DEB_SIG tor-0.4.6.7-linux-gnu-ppc64le-bullseye.deb.sig
ENV FLATCLOUD_PGP_KEY E28D24AA6FE1AD3F6F258BA0D9CE2F6D968DDC54 ENV FLATCLOUD_PGP_KEY E28D24AA6FE1AD3F6F258BA0D9CE2F6D968DDC54
ENV PGP_KS_URL hkp://keyserver.ubuntu.com ENV PGP_KS_URL hkp://keyserver.ubuntu.com
...@@ -39,8 +39,8 @@ RUN set -ex && \ ...@@ -39,8 +39,8 @@ RUN set -ex && \
wget "$TOR_DEB_URL" && \ wget "$TOR_DEB_URL" && \
gpg --keyserver "$PGP_KS_URL" --recv-keys "$FLATCLOUD_PGP_KEY" && \ gpg --keyserver "$PGP_KS_URL" --recv-keys "$FLATCLOUD_PGP_KEY" && \
gpg --verify "$TOR_DEB_SIG" && \ gpg --verify "$TOR_DEB_SIG" && \
echo "$TOR_SHA256 tor-0.4.6.7-linux-gnu-ppc64le.deb" | sha256sum -c - && \ echo "$TOR_SHA256 tor-0.4.6.7-linux-gnu-ppc64le-bullseye.deb" | sha256sum -c - && \
dpkg -i tor-0.4.6.7-linux-gnu-ppc64le.deb && \ dpkg -i tor-0.4.6.7-linux-gnu-ppc64le-bullseye.deb && \
rm -rf /tmp/* rm -rf /tmp/*
# Install whirlpool-cli # Install whirlpool-cli
...@@ -72,4 +72,3 @@ EXPOSE 8898 ...@@ -72,4 +72,3 @@ EXPOSE 8898
# Switch to user whirlpool # Switch to user whirlpool
USER whirlpool USER whirlpool
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment