Skip to content

Commit e29aeb9

Browse files
authored
Merge pull request #8 from dmitryesin/feature/docker-setup
feature/docker-setup
2 parents 19f420d + 7e82a03 commit e29aeb9

File tree

3 files changed

+20
-10
lines changed

3 files changed

+20
-10
lines changed

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ services:
4545
- solver-network
4646

4747
solver-db:
48-
image: postgres:17.5
48+
image: postgres:17.5-alpine
4949
container_name: diffy-bot-db-container
5050
environment:
5151
POSTGRES_USER: ${DB_USERNAME}
@@ -55,7 +55,7 @@ services:
5555
- "5433:5432"
5656
volumes:
5757
- pgdata:/var/lib/postgresql/data
58-
- ./database/schema.sql:/docker-entrypoint-initdb.d/init.sql
58+
- ./database/schema.sql:/docker-entrypoint-initdb.d/init.sql:ro
5959
networks:
6060
- solver-network
6161

solver-bot/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM python:3.13.3-slim
22

33
WORKDIR /solver-client
44

5-
COPY solver-bot /solver-client
6-
COPY .env .env
5+
COPY solver-bot .
6+
COPY .env .
77

88
RUN pip install --no-cache-dir -r requirements.txt
99

solver-common/Dockerfile

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
1-
FROM openjdk:21-jdk-slim
1+
FROM openjdk:21-slim AS builder
22

33
WORKDIR /solver-server
44

5-
RUN apt-get update && apt-get install -y maven
6-
7-
COPY solver-common /solver-server
8-
COPY .env .env
5+
RUN apt-get update && \
6+
apt-get install -y --no-install-recommends maven && \
7+
apt-get clean && \
8+
rm -rf /var/lib/apt/lists/*
99

10+
COPY solver-common/pom.xml .
1011
RUN mvn dependency:go-offline
1112

12-
RUN mvn clean install
13+
COPY solver-common .
14+
COPY .env .
15+
RUN mvn clean package -DskipTests -B
16+
17+
FROM openjdk:21-slim
18+
19+
WORKDIR /solver-server
20+
21+
COPY --from=builder /solver-server/target/solver-0.1.jar /solver-server/target/solver-0.1.jar
22+
COPY --from=builder /solver-server/.env /solver-server/.env
1323

1424
CMD ["java", "-jar", "target/solver-0.1.jar"]

0 commit comments

Comments
 (0)