Add ghcr.io and update to QtCreator 11.0.1

arBmind · Aug 5, 2023 · e0578b3 · e0578b3
1 parent c3ea37e
commit e0578b3
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 8 deletions.
diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
@@ -19,21 +19,31 @@ jobs:
         qt_version: ['6.4.3', '6.5.2']
         qtcreator: [
           {version: "10.0.1-patched", url: "https://github.com/hicknhack-software/Qt-Creator/releases/download/v10.0.1-snapshot-2023-04-02/qtcreator-linux-x64-4589869247.7z"},
-          {version: "11.0.0", url: "https://github.com/qt-creator/qt-creator/releases/download/v11.0.0/qtcreator-linux-x64-11.0.0.7z"},
-          {version: "11.0.0-patched", url: "https://github.com/hicknhack-software/Qt-Creator/releases/download/v11.0.0-patched/qtcreator-linux-x64-5627262990.7z"}
+          {version: "11.0.1", url: "https://github.com/qt-creator/qt-creator/releases/download/v11.0.1/qtcreator-linux-x64-11.0.1.7z"},
+          {version: "11.0.1-patched", url: "https://github.com/hicknhack-software/Qt-Creator/releases/download/v11.0.1-patched/qtcreator-linux-x64-5770500624.7z"}
         ]
 
         include:
           - distro: lunar
             clang: {major: 16, source: 'apt'}
             gcc: {major: 13, source: 'apt'}
             qt_version: '6.5.2'
-            qtcreator: {version: "11.0.0-patched", url: "https://github.com/hicknhack-software/Qt-Creator/releases/download/v11.0.0-patched/qtcreator-linux-x64-5627262990.7z"}
-            clang_tags: arbmind/qtcreator-clang:latest
-            clang_libstdcpp_tags: arbmind/qtcreator-clang-libstdcpp:latest
-            clang_libstdcpp_qt_tags: arbmind/qtcreator-clang-libstdcpp-qt:latest
-            gcc_tags: arbmind/qtcreator-gcc:latest
-            gcc_qt_tags: arbmind/qtcreator-gcc-qt:latest
+            qtcreator: {version: "11.0.1-patched", url: "https://github.com/hicknhack-software/Qt-Creator/releases/download/v11.0.1-patched/qtcreator-linux-x64-5770500624.7z"}
+            clang_tags: |
+              arbmind/qtcreator-clang:latest
+              ghcr.io/arbmind/qtcreator-clang:latest
+            clang_libstdcpp_tags: |
+              arbmind/qtcreator-clang-libstdcpp:latest
+              ghcr.io/arbmind/qtcreator-clang-libstdcpp:latest
+            clang_libstdcpp_qt_tags: |
+              arbmind/qtcreator-clang-libstdcpp-qt:latest
+              ghcr.io/arbmind/qtcreator-clang-libstdcpp-qt:latest
+            gcc_tags: |
+              arbmind/qtcreator-gcc:latest
+              ghcr.io/arbmind/qtcreator-gcc:latest
+            gcc_qt_tags: |
+              arbmind/qtcreator-gcc-qt:latest
+              ghcr.io/arbmind/qtcreator-gcc-qt:latest
 
     runs-on: ubuntu-latest
     steps:
@@ -49,13 +59,22 @@ 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: QtCreator ${{ matrix.qtcreator.version }} + Clang${{ matrix.clang.major }}
         uses: docker/build-push-action@v3
         with:
           target: qtcreator-clang
           push: ${{ github.event_name != 'pull_request' }}
           tags: |
             arbmind/qtcreator-clang:${{ matrix.qtcreator.version }}-${{ matrix.clang.major }}
+            ghcr.io/arbmind/qtcreator-clang:${{ matrix.qtcreator.version }}-${{ matrix.clang.major }}
             ${{ matrix.clang_tags }}
           build-args: |
             DISTRO=${{ matrix.distro }}
@@ -72,6 +91,7 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: |
             arbmind/qtcreator-clang-libstdcpp:${{ matrix.qtcreator.version }}-${{ matrix.clang.major }}-${{ matrix.gcc.major }}
+            ghcr.io/arbmind/qtcreator-clang-libstdcpp:${{ matrix.qtcreator.version }}-${{ matrix.clang.major }}-${{ matrix.gcc.major }}
             ${{ matrix.clang_libstdcpp_tags }}
           build-args: |
             DISTRO=${{ matrix.distro }}
@@ -90,6 +110,7 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: |
             arbmind/qtcreator-clang-libstdcpp-qt:${{ matrix.qtcreator.version }}-${{ matrix.clang.major }}-${{ matrix.gcc.major }}-${{ matrix.qt_version }}
+            ghcr.io/arbmind/qtcreator-clang-libstdcpp-qt:${{ matrix.qtcreator.version }}-${{ matrix.clang.major }}-${{ matrix.gcc.major }}-${{ matrix.qt_version }}
             ${{ matrix.clang_libstdcpp_qt_tags }}
           build-args: |
             DISTRO=${{ matrix.distro }}
@@ -108,6 +129,7 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: |
             arbmind/qtcreator-gcc:${{ matrix.qtcreator.version }}-${{ matrix.gcc.major }}
+            ghcr.io/arbmind/qtcreator-gcc:${{ matrix.qtcreator.version }}-${{ matrix.gcc.major }}
             ${{ matrix.gcc_tags }}
           build-args: |
             DISTRO=${{ matrix.distro }}
@@ -124,6 +146,7 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: |
             arbmind/qtcreator-gcc-qt:${{ matrix.qtcreator.version }}-${{ matrix.gcc.major }}-${{ matrix.qt_version }}
+            ghcr.io/arbmind/qtcreator-gcc-qt:${{ matrix.qtcreator.version }}-${{ matrix.gcc.major }}-${{ matrix.qt_version }}
             ${{ matrix.gcc_qt_tags }}
           build-args: |
             DISTRO=${{ matrix.distro }}

diff --git a/Dockerfile b/Dockerfile
@@ -165,6 +165,7 @@ ARG CLANG_MAJOR
 ARG QTCREATOR_VERSION
 
 LABEL Description="Ubuntu ${DISTRO} - Clang-${CLANG_MAJOR} + QtCreator-${QTCREATOR_VERSION}"
+LABEL org.opencontainers.image.source = "https://github.com/arBmind/qtcreator-containers"
 
 USER ${USER}
 ENV \
@@ -200,6 +201,7 @@ ARG CLANG_MAJOR
 ARG QTCREATOR_VERSION
 
 LABEL Description="Ubuntu ${DISTRO} - Clang${CLANG_MAJOR} + libstdc++-${GCC_MAJOR} + QtCreator-${QTCREATOR_VERSION}"
+LABEL org.opencontainers.image.source = "https://github.com/arBmind/qtcreator-containers"
 
 USER ${USER}
 ENV \
@@ -217,6 +219,7 @@ ARG QT_ARCH
 ARG QT_VERSION
 
 LABEL Description="Ubuntu ${DISTRO} - Clang${CLANG_MAJOR} + libstdc++-${GCC_MAJOR} + QtCreator-${QTCREATOR_VERSION} + Qt-${QT_VERSION}"
+LABEL org.opencontainers.image.source = "https://github.com/arBmind/qtcreator-containers"
 
 COPY --from=qt_base /qt/${QT_VERSION}/${QT_ARCH} /opt/qt
 
@@ -257,6 +260,7 @@ ARG GCC_MAJOR
 ARG QTCREATOR_VERSION
 
 LABEL Description="Ubuntu ${DISTRO} - GCC-${GCC_MAJOR} + QtCreator-${QTCREATOR_VERSION}"
+LABEL org.opencontainers.image.source = "https://github.com/arBmind/qtcreator-containers"
 
 USER ${USER}
 ENV \
@@ -273,6 +277,7 @@ ARG QT_ARCH
 ARG QT_VERSION
 
 LABEL Description="Ubuntu ${DISTRO} - GCC-${GCC_MAJOR} + QtCreator-${QTCREATOR_VERSION} + Qt-${QT_VERSION}"
+LABEL org.opencontainers.image.source = "https://github.com/arBmind/qtcreator-containers"
 
 COPY --from=qt_base /qt/${QT_VERSION}/${QT_ARCH} /opt/qt