Compare revisions

Griefed · Griefed · Griefed · Griefed · RenovateBot · Griefed
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,10 +4,10 @@ stages:
  - build
 test docker:
-  image: docker:latest
+  image: griefed/gitlab-ci-cd:1.0.4
  stage: test
  services:
-    - name: docker:dind
+    - name: griefed/gitlab-ci-cd:1.0.4
      alias: docker
      command: ["--experimental"]
  variables:
@@ -34,20 +34,6 @@ test docker:
    - 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"
-      --build-arg VERSION="$CI_COMMIT_SHORT_SHA"
-      --build-arg OVERLAY_VERSION="$OVERLAY_VERSION"
-      --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"
@@ -63,18 +49,15 @@ test docker:
    - 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 create "$CI_REGISTRY_IMAGE:develop" "$CI_REGISTRY_IMAGE:amd64-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 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: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 create "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:develop" "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-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:
@@ -86,9 +69,9 @@ test docker:
 release:
  needs: ['test docker']
  stage: release
-  image: griefed/gitlab-semantic-release:latest
+  image: griefed/gitlab-ci-cd:1.0.4
  services:
-    - name: docker:dind
+    - name: griefed/gitlab-ci-cd:1.0.4
      alias: docker
  variables:
    project_name: $CI_PROJECT_NAME
@@ -104,10 +87,10 @@ release:
      - $CI_COMMIT_TITLE =~ /^RELEASE:.+$/
 build:
-  image: docker:latest
+  image: griefed/gitlab-ci-cd:1.0.4
  stage: build
  services:
-    - name: docker:dind
+    - name: griefed/gitlab-ci-cd:1.0.4
      alias: docker
      command: ["--experimental"]
  variables:
@@ -140,26 +123,6 @@ build:
    - 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"
-      --build-arg VERSION="$CI_COMMIT_TAG"
-      --build-arg OVERLAY_VERSION="$OVERLAY_VERSION"
-      --build-arg OVERLAY_ARCH=arm .
-    - docker push "$CI_REGISTRY_IMAGE:armhf-latest"
-    - 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"
@@ -180,31 +143,18 @@ build:
    - 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
-    - docker manifest push --purge "$CI_REGISTRY_IMAGE:latest"
-    - docker manifest create "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" "$CI_REGISTRY_IMAGE:amd64-$CI_COMMIT_TAG" "$CI_REGISTRY_IMAGE:armhf-$CI_COMMIT_TAG" "$CI_REGISTRY_IMAGE:arm64-$CI_COMMIT_TAG"
-    - 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 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: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
    - docker manifest push --purge "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:latest"
-    - docker manifest create "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:$CI_COMMIT_TAG" "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-$CI_COMMIT_TAG" "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:armhf-$CI_COMMIT_TAG" "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-$CI_COMMIT_TAG"
+    - docker manifest create "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:$CI_COMMIT_TAG" "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-$CI_COMMIT_TAG" "index.docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:arm64-$CI_COMMIT_TAG"
-    - 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 create "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:latest" "ghcr.io/$DOCKERHUB_USER/$DOCKERHUB_REPO:amd64-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 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: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:

--- a/.gitlab/issue_templates/bug-report.md
+++ b/.gitlab/issue_templates/bug-report.md
+---
+name: Bug Report
+about: Report a bug in the application
+---
+* **What is the current behavior?**
+<!-- Issues like "doesn't work" and then not providing information as to WHAT isn't working, may be closed without further comment.-->
+* **If the current behavior is a bug, please provide the steps to reproduce**
+<!-- providing steps to reproduce is vital in order to verify that it is indeed a bug in the software, and not just a misconfiguration on your part. It helps us track down the source of the problem. -->
+* **What is the expected behavior?**
+<!-- How is it supposed to work, but currently isn't? What's the expected outcome of what you are currently trying to do? -->
+* **Please tell us about your environment:**
+<!-- Failing to provide this information slows down reacting on your issue. Withholding this information may lead to us not being able to reproduce your problem to find the source of the problem. -->
+- Your Operating System:
+- Your Java version: 
+- Your version of this piece of software:
+- Your config file: <!-- Upload your config-file to https://gist.github.com/ --> 
+- Your latest log file: <!-- Upload your log-file to https://gist.github.com/ -->
+* **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. stackoverflow, gitter, etc)
--- a/.gitlab/issue_templates/documentation-request.md
+++ b/.gitlab/issue_templates/documentation-request.md
+---
+name: Documentation Request
+about: Request for documentation about a certain aspect of this piece of software
+---
+# Documentation Request
+<!-- Delete this line and everything below it, but read below first for information on what you should include -->
+Please include the following:
+ * Links to any existing documentation if it exists but is unclear.
+ * Information on what feature/aspect of this application needs updating / expansion.
+ * What you're currently trying to do with the application that has led you to require the given feature.
+ * Some background on what information you might like to see in the documentation.
--- a/.gitlab/issue_templates/feature-request.md
+++ b/.gitlab/issue_templates/feature-request.md
+---
+name: Feature Request
+about: Request a feature for this piece of software
+---
+* **What is the current behavior?**
+<!-- Issues like "doesn't work" and then not providing information as to WHAT isn't working, may be closed without further comment.-->
+* **What is the wanted/requested behavior?**
+<!-- How is it supposed to work, but currently isn't? What's the expected outcome of what you are currently trying to do? -->
+* **What are your reasons for making this feature request? Provide solid arguments on why I should start working on it.**
--- a/.gitlab/issue_templates/pull_request.md
+++ b/.gitlab/issue_templates/pull_request.md
+---
+name: Pull Request
+about: Pull request for a change / addition / fix you made to the repository.
+---
+* **Please check if the PR fulfills these requirements**
+- [ ] Docs have been added / updated (for bug fixes / features)
+- [ ] Commits follow conventional commits
+<!--
+- type: breaking  # Changes that break something makes something incompatible to ealier version
+release: major
+- type: build     # Changes that affect the build system or external dependencies
+release: patch
+- type: chore     # Other changes that don't modify src or test files
+release: false
+- type: ci        # Changes to our CI configuration files and scripts
+release: false
+- type: docs      # Documentation only changes
+release: false
+- type: feat      # A new feature
+release: minor
+- type: fix       # A bug fix
+release: patch
+- type: perf      # A code change that improves performance
+release: patch
+- type: refactor  # A code change that neither fixes a bug nor adds a feature
+release: false
+- type: revert    # Reverts a previous commit
+release: patch
+- type: style     # Changes that do not affect the meaning of the code
+release: false
+- type: test      # Adding missing tests or correcting existing tests
+release: false
+-->
+* **What kind of change does this PR introduce?** (Bug fix, feature, docs update, ...)
+* **What is the current behavior?** (You can also link to an open issue here)
+* **What is the new behavior (if this is a feature change)?**
+* **Does this PR introduce a breaking change?** (What changes might users need to make in their application due to this PR?)
+* **Other information**:
--- a/.releaserc.yml
+++ b/.releaserc.yml
@@ -22,7 +22,7 @@ verifyConditions:
 analyzeCommits:
  - path: '@semantic-release/commit-analyzer'
    releaseRules:
-      - breaking: true
+      - type: breaking  # Changes that break something makes something incompatible to ealier version
        release: major
      - type: build     # Changes that affect the build system or external dependencies
        release: patch

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+## [2.0.0](https://git.griefed.de/prosper/docker-baseimage-ubuntu/compare/1.4.0...2.0.0) (2021-11-16)
+### 🦊 CI/CD
+* Fix breaking type ([fce0211](https://git.griefed.de/prosper/docker-baseimage-ubuntu/commit/fce0211688ec293d780b80a3ce80c9bcc259f6f2))
+* Fix typo in image name ([a116507](https://git.griefed.de/prosper/docker-baseimage-ubuntu/commit/a116507e2e86060e3aacbff67007fdb4341811a0))
+* Switch image to gitlab-ci-cd which provides for all jobs ([7f24150](https://git.griefed.de/prosper/docker-baseimage-ubuntu/commit/7f24150ff74b30a072615e3d29dffa69bff78d4b))
+### Other
+* Add GitLab issue templates ([97c9498](https://git.griefed.de/prosper/docker-baseimage-ubuntu/commit/97c94983009b1cd3b3790dfd9c21d2c1293f5747))
+* **deps:** update griefed/gitlab-ci-cd docker tag to v1.0.1 ([613a6f9](https://git.griefed.de/prosper/docker-baseimage-ubuntu/commit/613a6f9a96d6655afcff3f0d1d63d6ef497a5d10))
+* **deps:** update griefed/gitlab-ci-cd docker tag to v1.0.3 ([ead7ca4](https://git.griefed.de/prosper/docker-baseimage-ubuntu/commit/ead7ca4556f6ffde386d6f16b0b21e014e07c908))
 ## [1.4.0](https://git.griefed.de/prosper/docker-baseimage-ubuntu/compare/1.3.0...1.4.0) (2021-07-10)
No results found