.gitlab-ci.yml

@@ -4,11 +4,11 @@ stages:
   - build
 
 services:
-  - name: griefed/gitlab-ci-cd:2.0.7
+  - name: ghcr.io/griefed/gitlab-ci-cd:2.0.8
     alias: docker
     command: ["--experimental"]
 
-image: griefed/gitlab-ci-cd:2.0.7
+image: ghcr.io/griefed/gitlab-ci-cd:2.0.8
 
 variables:
   project_name: $CI_PROJECT_NAME
@@ -16,6 +16,14 @@ variables:
   FOCAL_RELEASE_DATE: "current"
   OVERLAY_VERSION: "v2.2.0.3"
 
+workflow:
+  rules:
+    - if: '$CI_MERGE_REQUEST_EVENT_TYPE == "detached"'
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: never
+    - when: always
+
 test docker:
   stage: test
   before_script:
@@ -181,7 +189,7 @@ Check Packages:on-schedule:
       if [[ "$(git config --list | grep user.email)" != "user.email=$GIT_MAIL" ]];then
         git config --global user.email $GIT_MAIL
       fi
-      
+
       # Clean system of potentially interrupting images
       docker image rm -f $DOCKERHUB_USER/$DOCKERHUB_REPO:latest
       docker image rm -f $DOCKERHUB_REPO
@@ -194,74 +202,74 @@ Check Packages:on-schedule:
       # Clone the repository
       git clone $CI_PROJECT_URL.git /tmp/$CI_PROJECT_PATH && \
       cd /tmp/$CI_PROJECT_PATH && \
-      
+
       if [ ! -s "package_versions.txt" ];then
         echo "No package_versions.txt present. Creating..."
-      
+
         # Gather package information from latest build
         docker run --rm --entrypoint /bin/sh -v /tmp/$CI_PROJECT_PATH:/tmp $DOCKERHUB_USER/$DOCKERHUB_REPO:latest -c '\
           apt list -qq --installed > /tmp/package_versions.txt && \
           sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
           chmod 777 /tmp/package_versions.txt' && \
-      
+
         # Checkout our branch
         git checkout -f $CI_DEFAULT_BRANCH && \
-      
+
         wait && \
-      
+
         # Add and commit new file to repository
         git add package_versions.txt && \
         git commit -m 'chore: Add list of package versions.' && \
-      
+
         # Push the changes to the remote
         echo "https://***:***@$CI_SERVER_HOST/$CI_PROJECT_PATH.git"
         git push "https://$GIT_USER:$GITLAB_TOKEN@$CI_SERVER_HOST/$CI_PROJECT_PATH".git --all && \
-      
+
         # Nice
-        echo "package_versions.txt added."        
-      
+        echo "package_versions.txt added."
+
       elif [ -s "package_versions.txt" ];then
         echo "package_versions.txt present. Comapring..."
-      
+
         # Build local image for new package versions list
         docker build --no-cache --tag $DOCKERHUB_REPO . && \
-        
+
         # Get packages from newly build local image
         docker run --rm --entrypoint /bin/sh -v /tmp/$CI_PROJECT_PATH:/tmp $DOCKERHUB_REPO -c '\
           apt list -qq --installed > /tmp/package_versions_new.txt && \
           sort -o /tmp/package_versions_new.txt  /tmp/package_versions_new.txt && \
           chmod 777 /tmp/package_versions_new.txt' && \
-      
+
         # Get checksum of old packages
         OLD_CHECKSUM=$(md5sum package_versions.txt | cut -f1 -d" ") && \
-        
+
         # Get checksum of new packages
         NEW_CHECKSUM=$(md5sum package_versions_new.txt | cut -f1 -d" ") && \
-      
+
         # If new checksum is not the same as old checksum, we have new versions
         if [ "${OLD_CHECKSUM}" != "${NEW_CHECKSUM}" ]; then
-        
+
           # Checkout our branch
           git checkout -f $CI_DEFAULT_BRANCH && \
-        
+
           # Copy the new package versions list to repository
           mv -f package_versions_new.txt package_versions.txt && \
-        
+
           wait && \
-        
+
           # Add and commit new file to repository
           git add package_versions.txt && \
-          git commit -m 'build: Update installed packages.' && \
-        
+          git commit -m 'build: Update installed packages in Docker container.' && \
+
           # Push the changes to the remote
           git push "https://$GIT_USER:$GITLAB_TOKEN@$CI_SERVER_HOST/$CI_PROJECT_PATH.git" --all && \
-        
+
           # Nice
           echo "Packages updated."
         else
           echo "No package updates available."
         fi
-      
+
       fi
       echo "Comparison complete."
   after_script:

CHANGELOG.md

+## [2.1.10](https://git.griefed.de/prosper/docker-baseimage-ubuntu/compare/2.1.9...2.1.10) (2022-08-02)
+
+
+### 🦊 CI/CD
+
+* Update installed packages in Docker container. ([03d9bbf](https://git.griefed.de/prosper/docker-baseimage-ubuntu/commit/03d9bbfd8afa4b5fbbc6b5586e6fcf26825a0a6c))
+
+
+### Other
+
+* **deps:** update dependency griefed/gitlab-ci-cd to v2.0.8 ([9026e52](https://git.griefed.de/prosper/docker-baseimage-ubuntu/commit/9026e52f20c536ed47cc8aa81ea5d99e8d7b99f8))
+
 ## [2.1.9](https://git.griefed.de/prosper/docker-baseimage-ubuntu/compare/2.1.8...2.1.9) (2022-07-02)
 
 

package_versions.txt

@@ -15,25 +15,25 @@ dash/now 0.5.10.2-6 amd64 [installed,local]
 debconf/now 1.5.73 all [installed,local]
 debianutils/now 4.9.1 amd64 [installed,local]
 diffutils/now 1:3.7-3 amd64 [installed,local]
-dirmngr/now 2.2.19-3ubuntu2.1 amd64 [installed,local]
+dirmngr/now 2.2.19-3ubuntu2.2 amd64 [installed,local]
 dpkg/now 1.19.7ubuntu3.2 amd64 [installed,local]
 e2fsprogs/now 1.45.5-2ubuntu1.1 amd64 [installed,local]
 fdisk/now 2.34-0.1ubuntu9.3 amd64 [installed,local]
 file/now 1:5.38-4 amd64 [installed,local]
 findutils/now 4.7.0-1ubuntu1 amd64 [installed,local]
 gcc-10-base/now 10.3.0-1ubuntu1~20.04 amd64 [installed,local]
-git-man/now 1:2.25.1-1ubuntu3.4 all [installed,local]
-git/now 1:2.25.1-1ubuntu3.4 amd64 [installed,local]
-gnupg-l10n/now 2.2.19-3ubuntu2.1 all [installed,local]
-gnupg/now 2.2.19-3ubuntu2.1 all [installed,local]
-gnupg-utils/now 2.2.19-3ubuntu2.1 amd64 [installed,local]
-gpg-agent/now 2.2.19-3ubuntu2.1 amd64 [installed,local]
-gpgconf/now 2.2.19-3ubuntu2.1 amd64 [installed,local]
-gpg/now 2.2.19-3ubuntu2.1 amd64 [installed,local]
-gpgsm/now 2.2.19-3ubuntu2.1 amd64 [installed,local]
-gpgv/now 2.2.19-3ubuntu2.1 amd64 [installed,local]
-gpg-wks-client/now 2.2.19-3ubuntu2.1 amd64 [installed,local]
-gpg-wks-server/now 2.2.19-3ubuntu2.1 amd64 [installed,local]
+git-man/now 1:2.25.1-1ubuntu3.5 all [installed,local]
+git/now 1:2.25.1-1ubuntu3.5 amd64 [installed,local]
+gnupg-l10n/now 2.2.19-3ubuntu2.2 all [installed,local]
+gnupg/now 2.2.19-3ubuntu2.2 all [installed,local]
+gnupg-utils/now 2.2.19-3ubuntu2.2 amd64 [installed,local]
+gpg-agent/now 2.2.19-3ubuntu2.2 amd64 [installed,local]
+gpgconf/now 2.2.19-3ubuntu2.2 amd64 [installed,local]
+gpg/now 2.2.19-3ubuntu2.2 amd64 [installed,local]
+gpgsm/now 2.2.19-3ubuntu2.2 amd64 [installed,local]
+gpgv/now 2.2.19-3ubuntu2.2 amd64 [installed,local]
+gpg-wks-client/now 2.2.19-3ubuntu2.2 amd64 [installed,local]
+gpg-wks-server/now 2.2.19-3ubuntu2.2 amd64 [installed,local]
 grep/now 3.4-1 amd64 [installed,local]
 gzip/now 1.10-0ubuntu4.1 amd64 [installed,local]
 hostname/now 3.23 amd64 [installed,local]
@@ -121,9 +121,9 @@ libpcre3/now 2:8.39-12ubuntu0.1 amd64 [installed,local]
 libperl5.30/now 5.30.0-9ubuntu0.2 amd64 [installed,local]
 libprocps8/now 2:3.3.16-1ubuntu2.3 amd64 [installed,local]
 libpsl5/now 0.21.0-1ubuntu1 amd64 [installed,local]
-libpython3.8-minimal/now 3.8.10-0ubuntu1~20.04.4 amd64 [installed,local]
-libpython3.8/now 3.8.10-0ubuntu1~20.04.4 amd64 [installed,local]
-libpython3.8-stdlib/now 3.8.10-0ubuntu1~20.04.4 amd64 [installed,local]
+libpython3.8-minimal/now 3.8.10-0ubuntu1~20.04.5 amd64 [installed,local]
+libpython3.8/now 3.8.10-0ubuntu1~20.04.5 amd64 [installed,local]
+libpython3.8-stdlib/now 3.8.10-0ubuntu1~20.04.5 amd64 [installed,local]
 libreadline8/now 8.0-4 amd64 [installed,local]
 libroken18-heimdal/now 7.7.0+dfsg-1ubuntu1 amd64 [installed,local]
 librtmp1/now 2.4+20151223.gitfa8646d.1-2build1 amd64 [installed,local]
@@ -139,7 +139,7 @@ libsmartcols1/now 2.34-0.1ubuntu9.3 amd64 [installed,local]
 libsqlite3-0/now 3.31.1-4ubuntu0.3 amd64 [installed,local]
 libss2/now 1.45.5-2ubuntu1.1 amd64 [installed,local]
 libssh-4/now 0.9.3-2ubuntu2.2 amd64 [installed,local]
-libssl1.1/now 1.1.1f-1ubuntu2.15 amd64 [installed,local]
+libssl1.1/now 1.1.1f-1ubuntu2.16 amd64 [installed,local]
 libstdc++6/now 10.3.0-1ubuntu1~20.04 amd64 [installed,local]
 libsystemd0/now 245.4-4ubuntu3.17 amd64 [installed,local]
 libtasn1-6/now 4.16.0-2 amd64 [installed,local]
@@ -172,7 +172,7 @@ ncurses-bin/now 6.2-0ubuntu2 amd64 [installed,local]
 netbase/now 6.1 all [installed,local]
 net-tools/now 1.60+git20180626.aebd88e-1ubuntu1 amd64 [installed,local]
 openssh-client/now 1:8.2p1-4ubuntu0.5 amd64 [installed,local]
-openssl/now 1.1.1f-1ubuntu2.15 amd64 [installed,local]
+openssl/now 1.1.1f-1ubuntu2.16 amd64 [installed,local]
 passwd/now 1:4.8.1-1ubuntu5.20.04.2 amd64 [installed,local]
 patch/now 2.7.6-6 amd64 [installed,local]
 perl-base/now 5.30.0-9ubuntu0.2 amd64 [installed,local]