Smaller updates (#42)

* Update dependabot.yml * Update docker-image.yml Also push images on `push` event to container registry * Update Dockerfile Remove grouping - didn't work
svengo · Sep 20, 2023 · f3a1220 · f3a1220
1 parent d5c82c4
commit f3a1220
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 23 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,8 +9,6 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
-      time: "09:00"
-      timezone: "Europe/Berlin"
 
   # Maintain dependencies for GitHub Actions
   - package-ecosystem: "github-actions"

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -41,7 +41,7 @@ jobs:
       with:
         images: ${{ vars.IMAGE_NAMESPACE }}/${{ vars.IMAGE_NAME }}
         flavor: | 
-          latest=${{ github.event.release.prerelease == false }}
+          latest=${{ github.event_name == 'release' && github.event.release.prerelease == false }}
         tags: |
           type=match,pattern=v(.*),group=1
           type=sha
@@ -51,9 +51,8 @@ jobs:
       with:
         context: .
         file: ./Dockerfile
-        push: ${{ github.event_name == 'release' }}
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
-        cache-from: type=gha,scope=docker-tor-image
-        cache-to: type=gha,mode=max,scope=docker-tor-image
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
 
diff --git a/Dockerfile b/Dockerfile
@@ -7,7 +7,6 @@ ARG TZ=Europe/Berlin
 WORKDIR /tmp
 
 RUN \
-  echo "::group::Install required packages" && \
   set -o xtrace && \
   apk update && \
   apk add \
@@ -30,9 +29,7 @@ RUN \
     xz-dev \
     zlib-dev \
     zstd-dev && \
-  echo "::endgroup::" && \
   \
-  echo "::group::Download Tor" && \
   CURL_OPTIONS="--no-progress-meter --fail --location --remote-name" && \
   curl ${CURL_OPTIONS} "https://dist.torproject.org/tor-${TOR_VERSION}.tar.gz" && \
   curl ${CURL_OPTIONS} "https://dist.torproject.org/tor-${TOR_VERSION}.tar.gz.sha256sum" && \
@@ -43,9 +40,7 @@ RUN \
   sha256sum -c "tor-${TOR_VERSION}.tar.gz.sha256sum" && \
   gpg --verify "tor-${TOR_VERSION}.tar.gz.sha256sum.asc" && \
   tar -zxf "tor-${TOR_VERSION}.tar.gz" && \
-  echo "::endgroup::" && \
   \
-  echo "::group::Configure" && \
   cd tor-${TOR_VERSION} && \
   ./configure \
     --sysconfdir=/etc \
@@ -58,30 +53,19 @@ RUN \
     --enable-lzma \
     --enable-zstd \
     --silent && \
-  echo "::endgroup::" && \
   \
-  echo "::group::Build" && \
   CFLAGS=-Wno-cpp make && \
-  echo "::endgroup::" && \
   \
-  echo "::group::Test" && \
   make test && \
-  echo "::endgroup::" && \
   \
-  echo "::group::Install" && \
   make install && \
-  echo "::endgroup::" && \
   \
-  echo "::group::Cleanup" && \
   apk del build && \
   rm -rf /tmp/* && \
   rm -rf /var/cache/apk/* && \
-  echo "::endgroup::" && \
   \
-  echo "::group::Add tor user and group" && \
   addgroup -S tor && \
-  adduser -s /bin/false -SDH -G tor tor && \
-  echo "::endgroup::"
+  adduser -s /bin/false -SDH -G tor tor
 
 VOLUME /data
 WORKDIR /data