diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index ae0604b..bef6ca2 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -3,8 +3,8 @@ name: Docker on: pull_request: push: - branches-ignore: - - "*-PR" + branches: + - master env: # The fully qualified image name of the image to build. The first component is @@ -85,7 +85,9 @@ jobs: env.azul_docker_registry, env.azul_docker_pycharm_image ) }}" - cache-to: "${{ format( + # The value after '&&' in a ternary operator must be truthy, and since + # an empty string is falsy, we use ' ' instead. + cache-to: "${{ github.event_name == 'pull_request' && ' ' || format( 'type=registry,ref={0}{1}_buildcache,mode=max', env.azul_docker_registry, env.azul_docker_pycharm_image diff --git a/README.md b/README.md index 6a12a27..52b7a31 100644 --- a/README.md +++ b/README.md @@ -40,8 +40,26 @@ make images docker pull localhost:5000/docker.io/ucscgi/azul-pycharm:2023.2.3-5 # To examine the image for vulnerabilities, browse the image in Docker Desktop. # If an unnecessary package is found to have critical or high vulnerabilities, -# add a `RUN` instruction to the Dockerfile to remove the package. -# To test the image in Azul, run: -(cd ../azul && azul_docker_pycharm_version=2023.2.3-5 azul_docker_registry=localhost:5000/ make format) +# To test the image in Azul, you will need to temporarily modify Azul's +# `environment.py` to set the appropriate `azul_docker_images` value using the +# full image name noted above (starting with "localhost"). +cd ../azul +git diff +> diff --git a/environment.py b/environment.py +> index f888a1b8e..e41273695 100644 +> --- a/environment.py +> +++ b/environment.py +> @@ -273,7 +273,7 @@ def env() -> Mapping[str, Optional[str]]: +> 'ref': 'docker.io/library/python:{azul_python_version}-bullseye' +> }, +> 'pycharm': { +> - 'ref': 'docker.io/ucscgi/azul-pycharm:2023.3.4-15' +> + 'ref': 'localhost:5000/docker.io/ucscgi/azul-pycharm:2023.3.4-15' +> }, +> 'elasticsearch': { +> 'ref': 'docker.io/ucscgi/azul-elasticsearch:7.17.18-13' +make image_manifests.json +azul_docker_registry="" make format +cd - make stop_registry ```