Fix separators in catalog and dev-env images and dev-env volume (#4526)

.github/workflows/ci_cd.yml

@@ -251,7 +251,33 @@ jobs:
         uses: ./.github/actions/load-img
         with:
           run_id: ${{ github.run_id }}
-          setup_images: upstream_db catalog
+          setup_images: upstream_db
+
+      # Sets build args specifying versions needed to build Docker image.
+      - name: Prepare build args
+        id: prepare-build-args
+        run: |
+          just versions | tee "$GITHUB_OUTPUT"
+
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          install: true
+
+      - name: Build catalog dev image
+        uses: docker/build-push-action@v5
+        with:
+          context: catalog
+          target: cat
+          push: false
+          load: true
+          tags: openverse-catalog
+          cache-from: type=gha,scope=catalog_dev
+          cache-to: type=gha,scope=catalog_dev
+          build-args: |
+            CATALOG_PY_VERSION=${{ steps.prepare-build-args.outputs.catalog_py_version }}
+            CATALOG_AIRFLOW_VERSION=${{ steps.prepare-build-args.outputs.catalog_airflow_version }}
+            REQUIREMENTS_FILE=requirements-dev.txt
 
       - name: Run tests
         run: |

catalog/compose.yml

@@ -7,7 +7,7 @@ x-airflow-common: &airflow-common
   depends_on:
     - postgres
     - s3
-  image: openverse_catalog
+  image: openverse-catalog
   env_file:
     - .env
   build:

docker/dev_env/run.sh

@@ -2,10 +2,10 @@
 
 set -e
 
-container_name="openverse-dev-env"
-volume_name="$container_name"
+container_name="openverse-dev_env"
+volume_name="openverse_dev-env"
 
-if ! docker volume inspect openverse-dev-env &>/dev/null; then
+if ! docker volume inspect openverse-dev_env &>/dev/null; then
   docker volume create "$volume_name" 1>/dev/null
 fi
 
@@ -97,7 +97,7 @@ fi
 existing_container_id=$(docker ps -a --filter name="$container_name" -q)
 
 if [ -z "$existing_container_id" ]; then
-  docker run "${shared_args[@]}" "${run_args[@]}" openverse-dev-env:latest
+  docker run "${shared_args[@]}" "${run_args[@]}" openverse-dev_env:latest
 else
   # Do not need to bother checking if the container is already running, docker start
   # is a noop in that case with no adverse effects

ov

@@ -77,24 +77,24 @@ init)
   ;;
 
 build)
-  docker build "${@:2}" -t openverse-dev-env:latest "$dev_env"
+  docker build "${@:2}" -t openverse-dev_env:latest "$dev_env"
   ;;
 
 setup-env)
   "$_self" bash "$dev_env"/setup_env.sh
   ;;
 
 stop)
-  docker stop openverse-dev-env
+  docker stop openverse-dev_env
   ;;
 
 clean)
   # Using `|| true` allows these commands to be skipped if the
   # container, image or volume does not exist.
-  docker container stop openverse-dev-env || true
-  docker container rm openverse-dev-env || true
-  docker image rm openverse-dev-env || true
-  docker volume rm openverse-dev-env || true
+  docker container stop openverse-dev_env || true
+  docker container rm openverse-dev_env || true
+  docker image rm openverse-dev_env || true
+  docker volume rm openverse_dev-env || true
   ;;
 
 hook)