Compare revisions

Griefed · Griefed · Griefed · Griefed · Griefed · semantic-release-bot
--- a/.github/workflows/github_release.yml
+++ b/.github/workflows/github_release.yml
+name: Create GitHub Release after GitLab tag mirror
+on:
+  push:
+    tags:
+      - '*'
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      # GET LATEST CODE
+      - name: Checkout latest code
+        uses: actions/checkout@master
+        with:
+          fetch-depth: 0
+      # EXTRACT TAG FROM PUSH
+      - name: Get tag
+        id: tag
+        uses: dawidd6/action-get-tag@v1
+      - name: Use tag
+        run: echo ${{steps.tag.outputs.tag}}
+      # GENERATE CHANGELOG, RELEASE
+      - id: conventional_changelog
+        uses: ardalanamini/auto-changelog@master
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@latest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{steps.tag.outputs.tag}}
+          body: |
+            Automatic release of version: **${{steps.tag.outputs.tag}}**
+            **Changes in this release:**
+            ${{ steps.conventional_changelog.outputs.changelog }}
+          draft: false
+          prerelease: false
\ No newline at end of file
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,10 +18,13 @@ test docker:
  before_script:
    - docker login -u "$DOCKERHUB_USER" -p "$DOCKERHUB_TOKEN" docker.io
    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+    - docker login -u "$DOCKERHUB_USER" -p "$GITHUB_TOKEN" ghcr.io
  script:
+    - echo "**** Build amd64 ****"
    - docker build
      --tag "$CI_REGISTRY_IMAGE:amd64-develop"
      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-develop"
+      --tag "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-develop"
      --build-arg FOCAL_ARCH=amd64
      --build-arg FOCAL_RELEASE_DATE="$FOCAL_RELEASE_DATE"
      --build-arg BUILD_DATE="$CI_PIPELINE_CREATED_AT"
@@ -30,9 +33,12 @@ test docker:
      --build-arg OVERLAY_ARCH=amd64 .
    - docker push "$CI_REGISTRY_IMAGE:amd64-develop"
    - docker push "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-develop"
+    - docker push "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-develop"
+    - echo "**** Build armhf ****"
    - docker build
      --tag "$CI_REGISTRY_IMAGE:armhf-develop"
      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-develop"
+      --tag "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-develop"
      --build-arg FOCAL_ARCH=armhf
      --build-arg FOCAL_RELEASE_DATE="$FOCAL_RELEASE_DATE"
      --build-arg BUILD_DATE="$CI_PIPELINE_CREATED_AT"
@@ -41,9 +47,12 @@ test docker:
      --build-arg OVERLAY_ARCH=arm .
    - docker push "$CI_REGISTRY_IMAGE:armhf-develop"
    - docker push "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-develop"
+    - docker push "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-develop"
+    - echo "**** Build arm64 ****"
    - docker build
      --tag "$CI_REGISTRY_IMAGE:arm64-develop"
      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-develop"
+      --tag "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-develop"
      --build-arg FOCAL_ARCH=arm64
      --build-arg FOCAL_RELEASE_DATE="$FOCAL_RELEASE_DATE"
      --build-arg BUILD_DATE="$CI_PIPELINE_CREATED_AT"
@@ -52,14 +61,22 @@ test docker:
      --build-arg OVERLAY_ARCH=aarch64 .
    - docker push "$CI_REGISTRY_IMAGE:arm64-develop"
    - docker push "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-develop"
+    - docker push "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-develop"
+    - echo "**** Create GitLab manifest ****"
    - docker manifest create "$CI_REGISTRY_IMAGE:develop" "$CI_REGISTRY_IMAGE:amd64-develop" "$CI_REGISTRY_IMAGE:armhf-develop" "$CI_REGISTRY_IMAGE:arm64-develop"
    - docker manifest annotate "$CI_REGISTRY_IMAGE:develop" "$CI_REGISTRY_IMAGE:armhf-develop" --os linux --arch arm
    - docker manifest annotate "$CI_REGISTRY_IMAGE:develop" "$CI_REGISTRY_IMAGE:arm64-develop" --os linux --arch arm64 --variant v8
    - docker manifest push --purge "$CI_REGISTRY_IMAGE:develop"
+    - echo "**** Create DockerHub manifest ****"
    - docker manifest create "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop" "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-develop" "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-develop" "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-develop"
    - docker manifest annotate "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop" "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-develop" --os linux --arch arm
    - docker manifest annotate "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop" "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-develop" --os linux --arch arm64 --variant v8
    - docker manifest push --purge "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop"
+    - echo "**** Create GitHub manifest ****"
+    - docker manifest create "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop" "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-develop" "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-develop" "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-develop"
+    - docker manifest annotate "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop" "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-develop" --os linux --arch arm
+    - docker manifest annotate "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop" "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-develop" --os linux --arch arm64 --variant v8
+    - docker manifest push --purge "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop"
  except:
    refs:
      - tags
@@ -101,12 +118,16 @@ build:
  before_script:
    - docker login -u "$DOCKERHUB_USER" -p "$DOCKERHUB_TOKEN" docker.io
    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+    - docker login -u "$DOCKERHUB_USER" -p "$GITHUB_TOKEN" ghcr.io
  script:
+    - echo "**** Build amd64 ****"
    - docker build
      --tag "$CI_REGISTRY_IMAGE:amd64-latest"
      --tag "$CI_REGISTRY_IMAGE:amd64-$CI_COMMIT_TAG"
      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-latest"
      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-$CI_COMMIT_TAG"
+      --tag "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-latest"
+      --tag "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-$CI_COMMIT_TAG"
      --build-arg FOCAL_ARCH=amd64
      --build-arg FOCAL_RELEASE_DATE="$FOCAL_RELEASE_DATE"
      --build-arg BUILD_DATE="$CI_PIPELINE_CREATED_AT"
@@ -117,11 +138,16 @@ build:
    - docker push "$CI_REGISTRY_IMAGE:amd64-$CI_COMMIT_TAG"
    - docker push "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-latest"
    - docker push "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-$CI_COMMIT_TAG"
+    - docker push "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-latest"
+    - docker push "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-$CI_COMMIT_TAG"
+    - echo "**** Build armhf ****"
    - docker build
      --tag "$CI_REGISTRY_IMAGE:armhf-latest"
      --tag "$CI_REGISTRY_IMAGE:armhf-$CI_COMMIT_TAG"
      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-latest"
      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-$CI_COMMIT_TAG"
+      --tag "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-latest"
+      --tag "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-$CI_COMMIT_TAG"
      --build-arg FOCAL_ARCH=armhf
      --build-arg FOCAL_RELEASE_DATE="$FOCAL_RELEASE_DATE"
      --build-arg BUILD_DATE="$CI_PIPELINE_CREATED_AT"
@@ -132,11 +158,16 @@ build:
    - docker push "$CI_REGISTRY_IMAGE:armhf-$CI_COMMIT_TAG"
    - docker push "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-latest"
    - docker push "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-$CI_COMMIT_TAG"
+    - docker push "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-latest"
+    - docker push "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-$CI_COMMIT_TAG"
+    - echo "**** Build arm64 ****"
    - docker build
      --tag "$CI_REGISTRY_IMAGE:arm64-latest"
      --tag "$CI_REGISTRY_IMAGE:arm64-$CI_COMMIT_TAG"
      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-latest"
      --tag "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-$CI_COMMIT_TAG"
+      --tag "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-latest"
+      --tag "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-$CI_COMMIT_TAG"
      --build-arg FOCAL_ARCH=arm64
      --build-arg FOCAL_RELEASE_DATE="$FOCAL_RELEASE_DATE"
      --build-arg BUILD_DATE="$CI_PIPELINE_CREATED_AT"
@@ -147,6 +178,9 @@ build:
    - docker push "$CI_REGISTRY_IMAGE:arm64-$CI_COMMIT_TAG"
    - docker push "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-latest"
    - docker push "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-$CI_COMMIT_TAG"
+    - docker push "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-latest"
+    - docker push "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-$CI_COMMIT_TAG"
+    - echo "**** Create GitLab manifest ****"
    - docker manifest create "$CI_REGISTRY_IMAGE:latest" "$CI_REGISTRY_IMAGE:amd64-latest" "$CI_REGISTRY_IMAGE:armhf-latest" "$CI_REGISTRY_IMAGE:arm64-latest"
    - docker manifest annotate "$CI_REGISTRY_IMAGE:latest" "$CI_REGISTRY_IMAGE:armhf-latest" --os linux --arch arm
    - docker manifest annotate "$CI_REGISTRY_IMAGE:latest" "$CI_REGISTRY_IMAGE:arm64-latest" --os linux --arch arm64 --variant v8
@@ -155,6 +189,7 @@ build:
    - docker manifest annotate "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" "$CI_REGISTRY_IMAGE:armhf-$CI_COMMIT_TAG" --os linux --arch arm
    - docker manifest annotate "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" "$CI_REGISTRY_IMAGE:arm64-$CI_COMMIT_TAG" --os linux --arch arm64 --variant v8
    - docker manifest push --purge "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
+    - echo "**** Create DockerHub manifest ****"
    - docker manifest create "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:latest" "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-latest" "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-latest" "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-latest"
    - docker manifest annotate "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:latest" "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-latest" --os linux --arch arm
    - docker manifest annotate "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:latest" "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-latest" --os linux --arch arm64 --variant v8
@@ -163,5 +198,14 @@ build:
    - docker manifest annotate "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:$CI_COMMIT_TAG" "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-$CI_COMMIT_TAG" --os linux --arch arm
    - docker manifest annotate "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:$CI_COMMIT_TAG" "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-$CI_COMMIT_TAG" --os linux --arch arm64 --variant v8
    - docker manifest push --purge "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:$CI_COMMIT_TAG"
+    - echo "**** Create GitHub manifest ****"
+    - docker manifest create "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:latest" "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-latest" "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-latest" "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-latest"
+    - docker manifest annotate "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:latest" "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-latest" --os linux --arch arm
+    - docker manifest annotate "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:latest" "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-latest" --os linux --arch arm64 --variant v8
+    - docker manifest push --purge "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:latest"
+    - docker manifest create "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:$CI_COMMIT_TAG" "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-$CI_COMMIT_TAG" "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-$CI_COMMIT_TAG" "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-$CI_COMMIT_TAG"
+    - docker manifest annotate "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:$CI_COMMIT_TAG" "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-$CI_COMMIT_TAG" --os linux --arch arm
+    - docker manifest annotate "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:$CI_COMMIT_TAG" "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-$CI_COMMIT_TAG" --os linux --arch arm64 --variant v8
+    - docker manifest push --purge "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:$CI_COMMIT_TAG"
  only:
    - tags
\ No newline at end of file
--- a/.releaserc.yml
+++ b/.releaserc.yml
@@ -83,13 +83,16 @@ generateNotes:
          hidden: false
        - type: 'perf'
          section: '⏩ Performance'
+          hidden: false
        - type: 'refactor'
          section: ':scissors: Refactor'
          hidden: false
        - type: 'revert'
          section: '👀 Reverts'
+          hidden: false
        - type: 'style'
          section: '💈 Style'
+          hidden: false
        - type: 'test'
          section: '🧪 Tests'
          hidden: false

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+## [1.3.0](https://git.griefed.de/prosper/docker-baseimage-ubuntu/compare/1.2.0...1.3.0) (2021-07-09)
+### 🦊 CI/CD
+* Create release on GitHub after tag mirror from GitLab ([a5307eb](https://git.griefed.de/prosper/docker-baseimage-ubuntu/commit/a5307ebd7f41fd9b77d2fb739389d13155c956a1))
+* Move Docker build for GitHub container registry to GitLab ([d94b9f7](https://git.griefed.de/prosper/docker-baseimage-ubuntu/commit/d94b9f7320f3c1102d229ad72059b2e948bf5aea))
+### 🚀 Features
+* Add additional alias for cd .. ([9f689aa](https://git.griefed.de/prosper/docker-baseimage-ubuntu/commit/9f689aa470b66580408e628688974718bb517e1f))
+### Other
+* Add some flavour ([c951efb](https://git.griefed.de/prosper/docker-baseimage-ubuntu/commit/c951efb48446692bfbdf0601b05fea9f090197d7))
 ## [1.2.0](https://git.griefed.de/prosper/docker-baseimage-ubuntu/compare/1.1.1...1.2.0) (2021-06-28)

--- a/Dockerfile
+++ b/Dockerfile
@@ -130,6 +130,8 @@ RUN \
    >> /etc/bash.bashrc && \
  echo 'alias ..="cd .."' \
    >> /etc/bash.bashrc && \
+  echo 'alias cd..="cd .."' \
+    >> /etc/bash.bashrc && \
  echo "**** Cleanup ****" && \
  apt-get autoremove -y && \
  apt-get autoclean -y && \

--- a/renovate.json
+++ b/renovate.json
@@ -3,5 +3,7 @@
  "extends": [
    "config:base"
  ],
-  "prConcurrentLimit": 5
+  "prConcurrentLimit": 5,
+  "labels": ["dependencies"],
+  "assignees": ["Griefed"]
 }
--- a/root/etc/cont-init.d/10-adduser
+++ b/root/etc/cont-init.d/10-adduser
@@ -7,22 +7,50 @@ groupmod -o -g "$PGID" grfd
 usermod -o -u "$PUID" grfd
 echo '
-------------------------------------
+---------------------------------------------------------------------
-Original baseimage by
+                  Original baseimage by
-          _         ()
+                    _         ()
-         | |  ___   _    __
+                    | |  ___   _    __
-         | | / __| | |  /  \
+                    | | / __| | |  /  \
-         | | \__ \ | | | () |
+                    | | \__ \ | | | () |
-         |_| |___/ |_|  \__/
+                    |_| |___/ |_|  \__/
-Changed to fit the needs of Griefed.de
+Changed to fit the needs of Griefed.de. This fork was mainly created
-This fork was mainly created because I
+because I wanted to gather experience in writing my own baseimage.
-wanted to gather experience in writing
+Linuxserver.io provide top quality images with great complexity,
-my own baseimage.
+making them perfect for learning.
-Linuxserver.io provide top quality
-images with great complexity, making
+                -:                      ._~
-them perfect for learning.
+               .|=| ,,-_ \l||||||^~\ ;-~t=t`
-------------------------------------'
+               :t===t++|\ _-;;;;;- |+t=====_
+             , ^t====I~*.          :_\|t===I|\
+           -^t|^t|\-`                  .  r^ |t|*.
+         -|t~  `.                             :\+I*
+        ^t^:                                    `~t|
+      _++\.                                      -^tI\;; :`
+:~||+ttt=^  t=vftf                               .|======I
+ .r=====|. YWQDo 1WV{eq}Yky}4htoh1}YL+zsj}zff     .|====r.
+   \t==|`  kXDQD%Dqjv*\vj;tt-^1^-=t;jv\_vj;t=}t-   .|=t+_
+   ^t|j.   kDBBM@@Kv=fftt}++f+j+v|4n|^IIl^t~~|~l    `\ =|.
+  ,++:.     \h _%                 [-                  .It;
+  -=|       ;f- o                 f;                   ^=\
+   =|       ;f\,]                 +      ````....      ~=\
+  _=|.      ;= \z               :zynf   %SOX6%C0q=     ^=\
+  :++        v ;[               *   ^   a6%CpakhY+   .`It-
+   ^=\\`     |; }             fu{f1v=t+ n%Cda4hos~  .^I+|.
+   ;It=|:    I- }             GPZ9%Cpak=Cg89CCda4= .|==tl
+   \t===I,  :+\,v   .```..... ok4hozyu{\fekhYszx[\ l=====|,
+ `|======I` :|:\f   GSKgU9CCqlGWKg89%Cdt%SOX6%C0qv\=ttt+j|l:
+ ,;;--\++|  ,| ;t   Z6%C0ekhYrZ6%C0ekhY+a6%CpekhYt I+\.
+        ^t^ ,~--+  `0C0qkhYoz;a%Cqk4Yoz~. :::,,,-^t|
+         -|t^~_*I  -OXU%C0qk4 Kg89%Cda4=   .` :\tI_
+          .-|t| ^^  sL{}fv=t+:}L[}fv=tt~-\|t^|t|_.
+             :\|j===t|\*           ._~|t====^
+                ;=====t+j _-;;;;;- \|++t====:
+                 +=t^_;*\~^||||||^~\ - ,_|tt.
+                 \ `                      `_
+---------------------------------------------------------------------'
 echo '
 To support LSIO projects visit:
No results found