code-dot-org · cat5inthecradle · Aug 27, 2024 · Mar 13, 2024 · May 15, 2024 · Jul 22, 2024
@@ -69,7 +69,8 @@ steps:
       filename: unit-tests-cache-ubuntu-20.tar
 
   - name: unit-tests
-    # see: docker/dockerfiles/Dockerfile
+    # see: docker/continuous-integration/Dockerfile
+    # TODO: switch to codedotorg/cdo-ci
     image: codedotorg/code-dot-org:1.10.0
     pull: always
     volumes:
@@ -188,7 +189,8 @@ steps:
       filename: ui-tests-cache-ubuntu-20.tar
 
   - name: ui-tests
-    # see: docker/dockerfiles/Dockerfile
+    # see: docker/continuous-integration/Dockerfile
+    # TODO: switch to codedotorg/cdo-ci
     image: codedotorg/code-dot-org:1.10.0
     pull: always
     volumes:
@@ -287,6 +289,6 @@ trigger:
     - push
 ---
 kind: signature
-hmac: 952c3f87b96b6a57cfbb52f6c9e9b0adb88bc5ec0c775e79b2791349d80b0daa
+hmac: 8551f3e768d263e92bb0c8060de2b6bfd8cf939aa31c52047621485746726d16
 
 ...
@@ -36,8 +36,12 @@
 # infrastructure #
 ##################
 
-/.github/                   @code-dot-org/infrastructure
-/aws/                       @code-dot-org/infrastructure
-/cookbooks/                 @code-dot-org/infrastructure
-.drone.yml                  @code-dot-org/infrastructure
-.ruby-version               @code-dot-org/infrastructure
+# Must approve changes to:
+/.github/                       @code-dot-org/infrastructure
+/aws/                           @code-dot-org/infrastructure
+/cookbooks/                     @code-dot-org/infrastructure
+/docker/continuous-integration/ @code-dot-org/infrastructure
+.ruby-version                   @code-dot-org/infrastructure
+
+# May have feedback on:
+.drone.yml                      @code-dot-org/infrastructure
diff --git a/docker/README.md b/docker/README.md
@@ -70,7 +70,7 @@ The Docker Compose files use a bind-mount to make the entire code-dot-org source
 Make sure everything works locally using the instructions above.
 
 ```
-cd docker/dockerfiles
+cd docker/continuous-integration
 ```
 
 Sign in to Docker Hub through the command line; when prompted, enter the password found under "access token for docker cli authentication" in the lastpass docker hub notes field
@@ -85,14 +85,18 @@ Build a full image to your local machine
 docker build .
 ```
 
+**Note:** We are moving to a new naming convention in order to use different docker images for different purposes. What was the `code-dot-org` image will become the `cdo-ci` image. For now, these docs advise publishing both names.
+
 Tag the new image with an incremented version number. You can get the image id from the end of the build log or from `docker image list`.
 
 ```
 docker tag <image_id> codedotorg/code-dot-org:<version>
+docker tag <image_id> codedotorg/cdo-ci:<version>
 ```
 
 Upload the image to docker hub (supply the version used in the previous step)
 
 ```
 docker push codedotorg/code-dot-org:<version>
+docker push codedotorg/cdo-ci:<version>
 ```
diff --git a/docker/dockerfiles/Dockerfile → docker/continuous-integration/Dockerfile b/docker/dockerfiles/Dockerfile → docker/continuous-integration/Dockerfile
@@ -1,7 +1,10 @@
 # Pushed to Docker Hub at codedotorg/code-dot-org:<version>
+# TODO: Switch to pushing this to codedotorg/cdo-ci:<version> and update .drone.yml
 #
 # This Dockerfile builds the image used on DroneCI
 # and is referenced by version in .drone.yml
+# It could likely be used in other CI environments
+# with minor modifications.
 
 
 #########################################################

diff --git a/docker/dockerfiles/entrypoint.sh → docker/continuous-integration/entrypoint.sh b/docker/dockerfiles/entrypoint.sh → docker/continuous-integration/entrypoint.sh
diff --git a/docker/setup-compose.yml b/docker/setup-compose.yml
@@ -13,7 +13,8 @@
 version: "3"
 services:
   site:
-    image: codedotorg/code-dot-org:1.9.4
+    # TODO: switch to codedotorg/cdo-ci or other new image
+    image: codedotorg/code-dot-org:1.10.0
     user: ${FIXUID:-1000}:${FIXGID:-1000}
     volumes:
       - ../:/home/circleci/code-dot-org:delegated

diff --git a/docker/site-compose.yml b/docker/site-compose.yml
@@ -16,7 +16,8 @@
 version: "3"
 services:
   site:
-    image: codedotorg/code-dot-org:1.9.4
+    # TODO: switch to codedotorg/cdo-ci or other new image
+    image: codedotorg/code-dot-org:1.10.0
     user: ${FIXUID:-1000}:${FIXGID:-1000}
     volumes:
       - ../:/home/circleci/code-dot-org:delegated

diff --git a/docker/ui-tests-compose.yml b/docker/ui-tests-compose.yml
@@ -22,7 +22,8 @@
 version: "3"
 services:
   site:
-    image: codedotorg/code-dot-org:1.9.4
+    # TODO: switch to codedotorg/cdo-ci or other new image
+    image: codedotorg/code-dot-org:1.10.0
     user: ${FIXUID:-1000}:${FIXGID:-1000}
     volumes:
       - ../:/home/circleci/code-dot-org:delegated

diff --git a/docker/unit-tests-compose.yml b/docker/unit-tests-compose.yml
@@ -19,7 +19,8 @@
 version: "3"
 services:
   site:
-    image: codedotorg/code-dot-org:1.9.4
+    # TODO: switch to codedotorg/cdo-ci or other new image
+    image: codedotorg/code-dot-org:1.10.0
     user: ${FIXUID:-1000}:${FIXGID:-1000}
     volumes:
       - ../:/home/circleci/code-dot-org:delegated