Update the Dockerfile, docker-compose and .env files

Author: victorsteven

.env

@@ -1,29 +1,30 @@
 # Postgres Live
-DB_HOST=fullstack-postgres                      # used when running the app with docker
+DB_HOST=fullstack-postgres                      
 # DB_HOST=127.0.0.1                             # when running the app without docker 
 DB_DRIVER=postgres
 API_SECRET=98hbun98h                            # Used for creating a JWT. Can be anything 
 DB_USER=steven
-DB_PASSWORD=
+DB_PASSWORD=password
 DB_NAME=fullstack_api
 DB_PORT=5432 
 
+# Used by pgadmin service 
 PGADMIN_DEFAULT_EMAIL=live@admin.com
 PGADMIN_DEFAULT_PASSWORD=password
 
 # Postgres Test
-TEST_DB_HOST=postgres_test                      # used when running the app with docker
+TEST_DB_HOST=postgres_test                      
 # TEST_DB_HOST=127.0.0.1                        # when running the app without docker 
 TEST_DB_DRIVER=postgres
 TEST_API_SECRET=98hbun98h
 TEST_DB_USER=steven
-TEST_DB_PASSWORD=
+TEST_DB_PASSWORD=password
 TEST_DB_NAME=fullstack_api_test
 TEST_DB_PORT=5432
 
 
 # # Mysql Live
-# DB_HOST=fullstack-mysql                       # used when running the app with docker
+# DB_HOST=fullstack-mysql                       
 # # DB_HOST=127.0.0.1                           # when running the app without docker 
 # DB_DRIVER=mysql 
 # API_SECRET=98hbun98h                          # Used for creating a JWT. Can be anything 
@@ -34,7 +35,7 @@ TEST_DB_PORT=5432
 
 
 # # Mysql Test
-# TEST_DB_HOST=mysql_test                        # used when running the app with docker
+# TEST_DB_HOST=mysql_test                        
 # # TEST_DB_HOST=127.0.0.1                       # when running the app without docker 
 # TEST_DB_DRIVER=mysql
 # TEST_API_SECRET=98hbun98h

Dockerfile

@@ -16,13 +16,12 @@ WORKDIR /app
 # Copy go mod and sum files 
 COPY go.mod go.sum ./
 
-# RUN go mod tidy
-
 # Download all dependencies. Dependencies will be cached if the go.mod and the go.sum files are not changed 
 RUN go mod download 
 
 # Copy the source from the current directory to the working Directory inside the container 
 COPY . .
+
 # Build the Go app
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o main .
 
@@ -32,7 +31,7 @@ RUN apk --no-cache add ca-certificates
 
 WORKDIR /root/
 
-# Copy the Pre-built binary file from the previous stage
+# Copy the Pre-built binary file from the previous stage. Observe we also copied the .env file
 COPY --from=builder /app/main .
 COPY --from=builder /app/.env .       
 

docker-compose.yml

@@ -9,79 +9,79 @@ services:
     volumes:
       - api:/usr/src/app/
     depends_on:
-      - fullstack-postgres          # Uncomment this when using postgres.
-      # - fullstack-mysql           # Uncomment this when using mysql.
+      # - fullstack-postgres          # Uncomment this when using postgres.
+      - fullstack-mysql           # Uncomment this when using mysql.
     networks:
       - fullstack
 
 
-  fullstack-postgres:
-    image: postgres:latest
-    container_name: full_db_postgres
-    environment:
-      - POSTGRES_USER=${DB_USER}  
-      - POSTGRES_PASSWORD=${DB_PASSWORD}
-      - POSTGRES_DB=${DB_NAME}
-      - DATABASE_HOST=${DB_HOST} 
-    ports:
-      - '5432:5432'
-    volumes:
-      - database_postgres:/var/lib/postgresql/data
-    networks:
-      - fullstack
-    
-  pgadmin:
-    image: dpage/pgadmin4
-    container_name: pgadmin_container
-    environment:
-      PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL}
-      PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD}
-    depends_on:
-      - fullstack-postgres
-    ports:
-      - "5050:80"
-    networks:
-      - fullstack
-    restart: unless-stopped
-
-  
-  # fullstack-mysql:
-  #   image: mysql:5.7
-  #   container_name: full_db_mysql
-  #   ports: 
-  #     - 3306:3306
-  #   environment: 
-  #     - MYSQL_ROOT_HOST=${DB_HOST} 
-  #     - MYSQL_USER=${DB_USER}
-  #     - MYSQL_PASSWORD=${DB_PASSWORD}
-  #     - MYSQL_DATABASE=${DB_NAME}
-  #     - MYSQL_ROOT_PASSWORD=${DB_PASSWORD}
+  # fullstack-postgres:
+  #   image: postgres:latest
+  #   container_name: full_db_postgres
+  #   environment:
+  #     - POSTGRES_USER=${DB_USER}  
+  #     - POSTGRES_PASSWORD=${DB_PASSWORD}
+  #     - POSTGRES_DB=${DB_NAME}
+  #     - DATABASE_HOST=${DB_HOST} 
+  #   ports:
+  #     - '5432:5432'
   #   volumes:
-  #     - database_mysql:/var/lib/mysql
+  #     - database_postgres:/var/lib/postgresql/data
   #   networks:
   #     - fullstack
-  
-  # phpmyadmin:
-  #   image: phpmyadmin/phpmyadmin
-  #   container_name: phpmyadmin_container
-  #   depends_on:
-  #     - fullstack-mysql
+    
+  # pgadmin:
+  #   image: dpage/pgadmin4
+  #   container_name: pgadmin_container
   #   environment:
-  #     - PMA_HOST=mysql # Note the "mysql". Must be the name of the what you used as the mysql service.
-  #     - PMA_USER=${DB_USER}
-  #     - PMA_PORT=${DB_PORT}
-  #     - PMA_PASSWORD=${DB_PASSWORD}
+  #     PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL}
+  #     PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD}
+  #   depends_on:
+  #     - fullstack-postgres
   #   ports:
-  #     - 9090:80
-  #   restart: always
+  #     - "5050:80"
   #   networks:
   #     - fullstack
+  #   restart: unless-stopped
+
+  
+  fullstack-mysql:
+    image: mysql:5.7
+    container_name: full_db_mysql
+    ports: 
+      - 3306:3306
+    environment: 
+      - MYSQL_ROOT_HOST=${DB_HOST} 
+      - MYSQL_USER=${DB_USER}
+      - MYSQL_PASSWORD=${DB_PASSWORD}
+      - MYSQL_DATABASE=${DB_NAME}
+      - MYSQL_ROOT_PASSWORD=${DB_PASSWORD}
+    volumes:
+      - database_mysql:/var/lib/mysql
+    networks:
+      - fullstack
+  
+  phpmyadmin:
+    image: phpmyadmin/phpmyadmin
+    container_name: phpmyadmin_container
+    depends_on:
+      - fullstack-mysql
+    environment:
+      - PMA_HOST=fullstack-mysql # Note the "mysql". Must be the name of the what you used as the mysql service.
+      - PMA_USER=${DB_USER}
+      - PMA_PORT=${DB_PORT}
+      - PMA_PASSWORD=${DB_PASSWORD}
+    ports:
+      - 9090:80
+    restart: always
+    networks:
+      - fullstack
 
 
 volumes:
   api:
-  database_postgres:                  # Uncomment this when using postgres.
-  # database_mysql:                   # Uncomment this when using mysql.
+  # database_postgres:                  # Uncomment this when using postgres.
+  database_mysql:                   # Uncomment this when using mysql.
 
 # Networks to be created to facilitate communication between containers
 networks: