From 503f492fee282a83fa563d04800b71bf239f3a1e Mon Sep 17 00:00:00 2001 From: Luc LAURENT Date: Fri, 13 Dec 2024 21:39:17 +0100 Subject: [PATCH 1/4] fix typo --- docker/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/README.md b/docker/README.md index 25f02d3..c390fb5 100644 --- a/docker/README.md +++ b/docker/README.md @@ -15,7 +15,7 @@ The container proposes to mount two volumes: - `/tmp/work` (**mandatory mount**) that must be link to a specific folder on the host computer - `/tmp/daemon` (optional mount) that store the log file of the daemon -For instance, the container can be run in CLI (in detached mode) with the following command (*by relacing `DIRA` and if necessary `DIRB`): +For instance, the container can be run in CLI (in detached mode) with the following command (*by replacing `DIRA` and if necessary `DIRB`): ``` docker run --name amc2moodle -d -v "DIRA:/tmp/work" -v "DIRB:/tmp/daemon" ghcr.io/nennigb/amc2moodle ``` From 76bbb43e659b1223a5449497b6797acc79ae8b6f Mon Sep 17 00:00:00 2001 From: Luc LAURENT Date: Fri, 13 Dec 2024 21:44:03 +0100 Subject: [PATCH 2/4] fix @main to @master --- .github/workflows/build-container.yml | 6 +++--- amc2moodle/_version.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml index 317be28..c0cb61e 100644 --- a/.github/workflows/build-container.yml +++ b/.github/workflows/build-container.yml @@ -22,16 +22,16 @@ jobs: uses: actions/checkout@main - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@main + uses: docker/setup-buildx-action@master - name: Login to Github Packages - uses: docker/login-action@main + uses: docker/login-action@master with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.PAT }} - name: 'Build:dockerimage' id: docker_build - uses: docker/build-push-action@main + uses: docker/build-push-action@master with: # relative path to the place where source code with Dockerfile is located context: ./docker diff --git a/amc2moodle/_version.py b/amc2moodle/_version.py index fb7a749..0b288f8 100644 --- a/amc2moodle/_version.py +++ b/amc2moodle/_version.py @@ -1 +1 @@ -__version__ = '2.11.0' +__version__ = '2.12.0' From 4a7734851663af7564d4fa04ab835abb39494137 Mon Sep 17 00:00:00 2001 From: Luc LAURENT Date: Sat, 14 Dec 2024 15:28:29 +0100 Subject: [PATCH 3/4] change for testing building --- .github/workflows/build-container.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml index c0cb61e..a5a01a3 100644 --- a/.github/workflows/build-container.yml +++ b/.github/workflows/build-container.yml @@ -4,8 +4,8 @@ on: push: # branches: # - 'master' - tags: - - 'v*' + # tags: + # - 'v*' jobs: @@ -32,14 +32,14 @@ jobs: - name: 'Build:dockerimage' id: docker_build uses: docker/build-push-action@master - with: - # relative path to the place where source code with Dockerfile is located - context: ./docker - tags: ghcr.io/${{ github.repository_owner }}/amc2moodle:${{ steps.docker-tag.outputs.tag }},ghcr.io/${{ github.repository_owner }}/amc2moodle:latest - push: true - cache-from: type=gha - cache-to: type=gha - # # build on feature branches, push only on main branch - # push: ${{ github.ref == 'refs/heads/main' }} + # with: + # # relative path to the place where source code with Dockerfile is located + # context: ./docker + # tags: ghcr.io/${{ github.repository_owner }}/amc2moodle:${{ steps.docker-tag.outputs.tag }},ghcr.io/${{ github.repository_owner }}/amc2moodle:latest + # push: true + # cache-from: type=gha + # cache-to: type=gha + # # # build on feature branches, push only on main branch + # # push: ${{ github.ref == 'refs/heads/main' }} - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} From 53aa069fe20f08231f6acdb769d81e2c50bdcd8b Mon Sep 17 00:00:00 2001 From: Luc LAURENT Date: Sat, 14 Dec 2024 15:29:53 +0100 Subject: [PATCH 4/4] revert changes --- .github/workflows/build-container.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml index a5a01a3..c0cb61e 100644 --- a/.github/workflows/build-container.yml +++ b/.github/workflows/build-container.yml @@ -4,8 +4,8 @@ on: push: # branches: # - 'master' - # tags: - # - 'v*' + tags: + - 'v*' jobs: @@ -32,14 +32,14 @@ jobs: - name: 'Build:dockerimage' id: docker_build uses: docker/build-push-action@master - # with: - # # relative path to the place where source code with Dockerfile is located - # context: ./docker - # tags: ghcr.io/${{ github.repository_owner }}/amc2moodle:${{ steps.docker-tag.outputs.tag }},ghcr.io/${{ github.repository_owner }}/amc2moodle:latest - # push: true - # cache-from: type=gha - # cache-to: type=gha - # # # build on feature branches, push only on main branch - # # push: ${{ github.ref == 'refs/heads/main' }} + with: + # relative path to the place where source code with Dockerfile is located + context: ./docker + tags: ghcr.io/${{ github.repository_owner }}/amc2moodle:${{ steps.docker-tag.outputs.tag }},ghcr.io/${{ github.repository_owner }}/amc2moodle:latest + push: true + cache-from: type=gha + cache-to: type=gha + # # build on feature branches, push only on main branch + # push: ${{ github.ref == 'refs/heads/main' }} - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }}