Merge pull request #90 from nastiausenko/docker

Docker
nastiausenko · Apr 24, 2024 · 70b013b · 70b013b
2 parents bb05e92 + f918cd0
commit 70b013b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,4 @@
+FROM openjdk:17
+COPY build/libs/url-shortener-0.0.1-SNAPSHOT.jar app.jar
+EXPOSE 8080
+CMD ["java", "-jar", "app.jar"]
diff --git a/docker/compose.yaml b/docker/compose.yaml
@@ -24,5 +24,21 @@ services:
     volumes:
       - postgres-data:/var/lib/postgresql/data
 
+  url-shortener:
+    image: 'url-shortener:latest'
+    container_name: url-shortener
+    environment:
+      POSTGRES_HOST: postgres
+      POSTGRES_PORT: ${POSTGRES_PORT:-5432}
+      REDIS_HOST: redis
+      REDIS_PORT: ${REDIS_PORT:-6379}
+    ports:
+      - "8080:8080"
+    depends_on:
+      - postgres
+      - redis
+
 volumes:
   postgres-data:
+
+
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -19,4 +19,5 @@ spring.h2.console.path=/h2-console
 spring.docker.compose.enabled=false
 
 # Profiling
-spring.profiles.default=dev
+spring.profiles.default=dev
+spring.profiles.active=prod, dev