diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml index b3bd6d6dac..e0afd18e36 100644 --- a/.github/workflows/docker_build.yml +++ b/.github/workflows/docker_build.yml @@ -13,22 +13,28 @@ on: required: true default: '0' +env: + REGISTRY: docker-private.packages.nuxeo.com + REPOSITORY: nuxeo-drive-build + jobs: job: runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Build and push the Docker image - uses: docker/build-push-action@v2.1.0 + - uses: actions/checkout@v2 + - uses: docker/login-action@v1 with: + registry: ${{ env.REGISTRY }} username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - registry: docker-private.packages.nuxeo.com - repository: nuxeo-drive-build - build_args: VERSION=${{ github.event.inputs.buildVersion }},SCM_REF=${{ env.GITHUB_SHA }} - dockerfile: tools/linux/Dockerfile - tags: py-${{ github.event.inputs.pythonVersion }} + - uses: docker/build-push-action@v2.1.0 + with: + context: . + file: tools/linux/Dockerfile + build-args: | + VERSION=${{ github.event.inputs.buildVersion }} + SCM_REF=${{ env.GITHUB_SHA }} + tags: ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:py-${{ github.event.inputs.pythonVersion }} push: true + - run: docker push ${{ env.REGISTRY }}/${{ env.REPOSITORY }}:py-${{ github.event.inputs.pythonVersion }} diff --git a/docs/changes/4.4.6.md b/docs/changes/4.4.6.md index 217eed4e2c..0adc614a03 100644 --- a/docs/changes/4.4.6.md +++ b/docs/changes/4.4.6.md @@ -64,6 +64,7 @@ Release date: `2020-xx-xx` - [NXDRIVE-2396](https://jira.nuxeo.com/browse/NXDRIVE-2396): Switch to the new Dependabot config file - [NXDRIVE-2398](https://jira.nuxeo.com/browse/NXDRIVE-2398): Upgrade PyInstaller to 4.1 - [NXDRIVE-2399](https://jira.nuxeo.com/browse/NXDRIVE-2399): Temporary stop releasing a GNU/Linux version +- [NXDRIVE-2401](https://jira.nuxeo.com/browse/NXDRIVE-2401): Upgrade the Docker build workflow to the new action version ## Tests