add ghcr.io and qbs 2.1.0 (3)

arBmind · Jul 29, 2023 · f16539b · f16539b
1 parent b695da9
commit f16539b
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 7 deletions.
diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
@@ -9,7 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         distro: ['lunar']
-        qbs_version: ['1.23.2', '1.24.1', '2.0.2']
+        qbs_version: ['1.24.1', '2.0.2', '2.1.0']
         clang: [
           {major: 14, source: 'apt'},
           {major: 15, source: 'apt'},
@@ -24,15 +24,25 @@ jobs:
 
         include:
           - distro: lunar
-            qbs_version: '2.0.2'
+            qbs_version: '2.1.0'
             clang: {major: 16, source: 'apt'}
             gcc: {major: 13, source: 'apt'}
             qt_version: '6.5.2'
-            gcc_tags: arbmind/qbs-gcc:latest
-            gcc_qt_tags: arbmind/qbs-gcc-qt:latest
-            clang_tags: arbmind/qbs-clang:latest
-            clang_libstdcpp_tags: arbmind/qbs-clang-libstdcpp:latest
-            clang_libstdcpp_qt_tags: arbmind/qbs-clang-libstdcpp-qt:latest
+            gcc_tags: |
+              arbmind/qbs-gcc:latest
+              ghcr.io/arbmind/qbs-gcc:latest
+            gcc_qt_tags: |
+              arbmind/qbs-gcc-qt:latest
+              ghcr.io/arbmind/qbs-gcc-qt:latest
+            clang_tags: |
+              arbmind/qbs-clang:latest
+              ghcr.io/arbmind/qbs-clang:latest
+            clang_libstdcpp_tags: |
+              arbmind/qbs-clang-libstdcpp:latest
+              ghcr.io/arbmind/qbs-clang-libstdcpp:latest
+            clang_libstdcpp_qt_tags: |
+              arbmind/qbs-clang-libstdcpp-qt:latest
+              ghcr.io/arbmind/qbs-clang-libstdcpp-qt:latest
 
     runs-on: ubuntu-latest
     steps:
@@ -48,6 +58,14 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Qbs ${{ matrix.qbs_version }} + GCC ${{ matrix.gcc.major }}
         uses: docker/build-push-action@v3
         with:
@@ -56,6 +74,7 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: |
             arbmind/qbs-gcc:${{ matrix.qbs_version }}-${{ matrix.gcc.major }}
+            ghcr.io/arbmind/qbs-gcc:${{ matrix.qbs_version }}-${{ matrix.gcc.major }}
             ${{ matrix.gcc_tags }}
           build-args: |
             DISTRO=${{ matrix.distro }}
@@ -71,6 +90,7 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: |
             arbmind/qbs-gcc-qt:${{ matrix.qbs_version }}-${{ matrix.gcc.major }}-${{ matrix.qt_version }}
+            ghcr.io/arbmind/qbs-gcc-qt:${{ matrix.qbs_version }}-${{ matrix.gcc.major }}-${{ matrix.qt_version }}
             ${{ matrix.gcc_qt_tags }}
           build-args: |
             DISTRO=${{ matrix.distro }}
@@ -86,6 +106,7 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: |
             arbmind/qbs-clang:${{ matrix.qbs_version }}-${{ matrix.clang.major }}
+            ghcr.io/arbmind/qbs-clang:${{ matrix.qbs_version }}-${{ matrix.clang.major }}
             ${{ matrix.clang_tags }}
           build-args: |
             DISTRO=${{ matrix.distro }}
@@ -101,6 +122,7 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: |
             arbmind/qbs-clang-libstdcpp:${{ matrix.qbs_version }}-${{ matrix.clang.major }}-${{ matrix.gcc.major }}
+            ghcr.io/arbmind/qbs-clang-libstdcpp:${{ matrix.qbs_version }}-${{ matrix.clang.major }}-${{ matrix.gcc.major }}
             ${{ matrix.clang_libstdcpp_tags }}
           build-args: |
             DISTRO=${{ matrix.distro }}
@@ -118,6 +140,7 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: |
             arbmind/qbs-clang-libstdcpp-qt:${{ matrix.qbs_version }}-${{ matrix.clang.major }}-${{ matrix.gcc.major }}-${{ matrix.qt_version }}
+            ghcr.io/arbmind/qbs-clang-libstdcpp-qt:${{ matrix.qbs_version }}-${{ matrix.clang.major }}-${{ matrix.gcc.major }}-${{ matrix.qt_version }}
             ${{ matrix.clang_libstdcpp_qt_tags }}
           build-args: |
             DISTRO=${{ matrix.distro }}

diff --git a/Dockerfile b/Dockerfile
@@ -113,6 +113,7 @@ ARG QT_ARCH
 ARG QBS_VERSION
 
 LABEL Description="Ubuntu ${DISTRO} - Gcc${GCC_MAJOR} + Qbs ${QBS_VERSION}"
+LABEL org.opencontainers.image.source = "https://github.com/arBmind/qbs-containers"
 
 COPY --from=qbs_base /opt/qbs /opt/qbs
 ENV \
@@ -135,6 +136,7 @@ ARG QT_ARCH
 ARG QBS_VERSION
 
 LABEL Description="Ubuntu ${DISTRO} - Gcc${GCC_MAJOR} + Qbs ${QBS_VERSION} + Qt ${QT_VERSION}"
+LABEL org.opencontainers.image.source = "https://github.com/arBmind/qbs-containers"
 
 COPY --from=qbs_base /opt/qbs /opt/qbs
 COPY --from=qt_base /qt/${QT_VERSION} /qt/${QT_VERSION}
@@ -208,6 +210,7 @@ ARG APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1
 ARG DEBIAN_FRONTEND=noninteractive
 
 LABEL Description="Ubuntu ${DISTRO} - Clang${CLANG_MAJOR} + Qbs ${QBS_VERSION}"
+LABEL org.opencontainers.image.source = "https://github.com/arBmind/qbs-containers"
 
 COPY --from=qbs_base /opt/qbs /opt/qbs
 ENV \
@@ -249,6 +252,7 @@ ARG GCC_MAJOR
 ARG QBS_VERSION
 
 LABEL Description="Ubuntu ${DISTRO} - Clang${CLANG_MAJOR} + Libstdc++-${GCC_MAJOR} + Qbs ${QBS_VERSION}"
+LABEL org.opencontainers.image.source = "https://github.com/arBmind/qbs-containers"
 
 COPY --from=qbs_base /opt/qbs /opt/qbs
 ENV \
@@ -272,6 +276,7 @@ ARG QT_ARCH
 ARG QBS_VERSION
 
 LABEL Description="Ubuntu ${DISTRO} - Clang${CLANG_MAJOR} + Libstdc++-${GCC_MAJOR} + Qbs ${QBS_VERSION} + Qt ${QT_VERSION}"
+LABEL org.opencontainers.image.source = "https://github.com/arBmind/qbs-containers"
 
 COPY --from=qbs_base /opt/qbs /opt/qbs
 COPY --from=qt_base /qt/${QT_VERSION} /qt/${QT_VERSION}