Revert "Add CONTAINERIZED_APP_NAME"

This reverts commit 0b1c70e.

.template/addons/docker/docker-compose.dev.yml.tt

@@ -3,15 +3,15 @@ version: '3.2'
 services:
   db:
     image: postgres:<%= POSTGRES_VERSION %>
-    container_name: <%= CONTAINERIZED_APP_NAME %>-db
+    container_name: <%= APP_NAME %>-db
     environment:
-      - POSTGRES_DB=<%= CONTAINERIZED_APP_NAME %>-development
+      - POSTGRES_DB=<%= APP_NAME %>-development
       - POSTGRES_PASSWORD=postgres
     ports:
       - "5432:5432"
 
   redis:
     image: redis:<%= REDIS_VERSION %>
-    container_name: <%= CONTAINERIZED_APP_NAME %>-redis
+    container_name: <%= APP_NAME %>-redis
     ports:
       - "6379:6379"

.template/addons/docker/docker-compose.test.yml.tt

@@ -3,16 +3,16 @@ version: '3.2'
 services:
   db:
     image: postgres:<%= POSTGRES_VERSION %>
-    container_name: <%= CONTAINERIZED_APP_NAME %>-db
+    container_name: <%= APP_NAME %>-db
     environment:
-      - POSTGRES_DB=<%= CONTAINERIZED_APP_NAME %>-test
+      - POSTGRES_DB=<%= APP_NAME %>-test
       - POSTGRES_PASSWORD=postgres
     ports:
       - "5432"
 
   redis:
     image: redis:<%= REDIS_VERSION %>
-    container_name: <%= CONTAINERIZED_APP_NAME %>-redis
+    container_name: <%= APP_NAME %>-redis
     ports:
       - "6379"
 
@@ -28,7 +28,7 @@ services:
         - NODE_ENV=test
         <%- end -%>
     image: ${DOCKER_REGISTRY_HOST}/${DOCKER_IMAGE}:${BRANCH_TAG}-test
-    container_name: <%= CONTAINERIZED_APP_NAME %>-test
+    container_name: <%= APP_NAME %>-test
     command: bin/test.sh
     stdin_open: true
     tty: true

.template/addons/docker/docker-compose.yml.tt

@@ -3,15 +3,15 @@ version: '3.2'
 services:
   db:
     image: postgres:<%= POSTGRES_VERSION %>
-    container_name: <%= CONTAINERIZED_APP_NAME %>-db
+    container_name: <%= APP_NAME %>-db
     environment:
-      - POSTGRES_DB=<%= CONTAINERIZED_APP_NAME %>-production
+      - POSTGRES_DB=<%= APP_NAME %>-production
     ports:
       - "5432:5432"
 
   redis:
     image: redis:<%= REDIS_VERSION %>
-    container_name: <%= CONTAINERIZED_APP_NAME %>-redis
+    container_name: <%= APP_NAME %>-redis
     ports:
       - "6379:6379"
 
@@ -28,7 +28,7 @@ services:
         - ASSET_HOST
         <%- end -%>
     image: ${DOCKER_REGISTRY_HOST}/${DOCKER_IMAGE}:${BRANCH_TAG}
-    container_name: <%= CONTAINERIZED_APP_NAME %>-web
+    container_name: <%= APP_NAME %>-web
     command: bin/start.sh
     ports:
       - "${PORT}:${PORT}"
@@ -44,7 +44,7 @@ services:
       <%- if WEB_VARIANT -%>
       - NODE_ENV=production
       <%- end -%>
-      - DATABASE_URL=postgres://postgres@db/<%= CONTAINERIZED_APP_NAME %>-production
+      - DATABASE_URL=postgres://postgres@db/<%= APP_NAME %>-production
       <%- if WEB_VARIANT -%>
       - ASSET_HOST
       <%- end -%>

.template/spec/support/serverspec.rb

@@ -15,7 +15,7 @@ def self.test_container
       logger.warn "Container: #{container.id} #{container.info['Names']}"
     end
 
-    container_name = "#{ENV.fetch('CONTAINERIZED_APP_NAME')}-test"
+    container_name = "#{ENV.fetch('APP_NAME')}-test-run"
     container_id = `docker ps -qf "name=#{container_name}"`
     logger.warn "Container name: #{container_name}"
     logger.warn "Container ID: #{container_id}"

template.rb

@@ -4,11 +4,10 @@
 
 # Variables
 APP_NAME = app_name
-CONTAINERIZED_APP_NAME = app_name.tr('_', '-')
 # Transform the app name from slug to human-readable name e.g. nimble-web -> Nimble
 APP_NAME_HUMANIZED = app_name.split(/[-_]/).map(&:capitalize).join(' ').gsub(/ Web$/, '')
 DOCKER_REGISTRY_HOST = 'docker.io'
-DOCKER_IMAGE = "nimblehq/#{CONTAINERIZED_APP_NAME}".freeze
+DOCKER_IMAGE = "nimblehq/#{APP_NAME}".freeze
 RUBY_VERSION = '3.2.2'
 POSTGRES_VERSION = '15.2'
 REDIS_VERSION = '6.2.7'