From 85a6e3518894686fe5e0ce6f066ad6fa952b6aed Mon Sep 17 00:00:00 2001 From: Maschell Date: Thu, 16 Mar 2023 12:46:07 +0100 Subject: [PATCH] Change docker registry to ghcr.io --- .github/workflows/pr.yml | 4 +-- .github/workflows/push_image.yml | 58 +++++++++++++++++++++----------- Dockerfile | 2 +- Dockerfile.buildexamples | 4 +-- Dockerfile.buildlocal | 2 +- README.MD | 6 ++-- 6 files changed, 47 insertions(+), 29 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f72a32a..f804986 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v2 - name: clang-format run: | - docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./include ./libraries + docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./include ./libraries build-lib: runs-on: ubuntu-22.04 needs: clang-format-lib @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@v2 - name: clang-format run: | - docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./plugins/example_plugin/src + docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./plugins/example_plugin/src build-examples: runs-on: ubuntu-22.04 needs: clang-format-examples diff --git a/.github/workflows/push_image.yml b/.github/workflows/push_image.yml index 47f7cc2..2202a67 100644 --- a/.github/workflows/push_image.yml +++ b/.github/workflows/push_image.yml @@ -3,6 +3,11 @@ on: push: branches: - master + +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + jobs: clang-format-lib: runs-on: ubuntu-22.04 @@ -10,7 +15,7 @@ jobs: - uses: actions/checkout@v2 - name: clang-format run: | - docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./include ./libraries + docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./include ./libraries build-lib: runs-on: ubuntu-22.04 needs: clang-format-lib @@ -26,7 +31,7 @@ jobs: - uses: actions/checkout@v2 - name: clang-format run: | - docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./plugins/example_plugin/src + docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./plugins/example_plugin/src build-examples: runs-on: ubuntu-22.04 needs: clang-format-examples @@ -37,23 +42,36 @@ jobs: docker build . -f Dockerfile.buildexamples -t builder cd ./plugins/example_plugin docker run --rm -v ${PWD}:/project builder make - push_image: + build-and-push-image: runs-on: ubuntu-latest - needs: [build-lib, build-examples] + permissions: + contents: read + packages: write + steps: - - uses: actions/checkout@master - - name: Get release version - id: get_release_tag - run: | - echo RELEASE_VERSION=$(echo $(date '+%Y%m%d')) >> $GITHUB_ENV - echo REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//" | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV - echo REPOSITORY_OWNER=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $1}' | sed 's/[^a-zA-Z0-9]//g' | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV - - name: Publish to Registry - uses: elgohr/Publish-Docker-Github-Action@master - with: - name: ${{ env.REPOSITORY_OWNER }}/${{ env.REPOSITORY_NAME }} - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - snapshot: true - cache: true - tags: "latest, ${{ env.RELEASE_VERSION }}" \ No newline at end of file + - name: Checkout repository + uses: actions/checkout@v3 + - name: Extract Docker metadata + id: meta + uses: docker/metadata-action@v4 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + tags: | + type=raw,value={{date 'YYYYMMDD'}}-{{sha}} + type=raw,value={{date 'YYYYMMDD'}} + type=raw,value=latest + + - name: Log into registry ${{ env.REGISTRY }} + uses: docker/login-action@v2.1.0 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.CI_PAT_WRITE_PACKAGE }} + + - name: Build and push Docker image + uses: docker/build-push-action@v4 + with: + context: . + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + push: true \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 5b02145..85ccae2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM wiiuenv/devkitppc:20230218 +FROM ghcr.io/wiiu-env/devkitppc:20230218 WORKDIR tmp_build COPY . . diff --git a/Dockerfile.buildexamples b/Dockerfile.buildexamples index b062a98..2da85f7 100644 --- a/Dockerfile.buildexamples +++ b/Dockerfile.buildexamples @@ -1,4 +1,4 @@ -FROM wiiuenv/devkitppc:20230218 +FROM ghcr.io/wiiu-env/devkitppc:20230218 WORKDIR tmp_build COPY . . @@ -8,7 +8,7 @@ WORKDIR /artifacts FROM scratch as libwups COPY --from=0 /artifacts /artifacts -FROM wiiuenv/devkitppc:20230218 +FROM ghcr.io/wiiu-env/devkitppc:20230218 COPY --from=libwups /artifacts $DEVKITPRO diff --git a/Dockerfile.buildlocal b/Dockerfile.buildlocal index f04b00a..28fb0f0 100644 --- a/Dockerfile.buildlocal +++ b/Dockerfile.buildlocal @@ -1,3 +1,3 @@ -FROM wiiuenv/devkitppc:20230218 +FROM ghcr.io/wiiu-env/devkitppc:20230218 WORKDIR project \ No newline at end of file diff --git a/README.MD b/README.MD index 82510e0..11c06b0 100644 --- a/README.MD +++ b/README.MD @@ -20,12 +20,12 @@ Then you can compile and install this lib via `make install`. A prebuilt version of this lib can found on dockerhub. To use it for your projects, add this to your Dockerfile. ``` [...] -COPY --from=wiiuenv/wiiupluginsystem:[tag] /artifacts $DEVKITPRO +COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:[tag] /artifacts $DEVKITPRO [...] ``` -Replace [tag] with a tag you want to use, a list of tags can be found [here](https://hub.docker.com/r/wiiuenv/wiiupluginsystem/tags). +Replace [tag] with a tag you want to use, a list of tags can be found [here](https://github.com/wiiu-env/WiiUPluginSystem/pkgs/container/wiiupluginsystem/versions). It's highly recommended to pin the version to the **latest date** instead of using `latest`. ## Format the code via docker -`docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./include ./libraries ./plugins/example_plugin/src -i` +`docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./include ./libraries ./plugins/example_plugin/src -i`