Skip to content

Commit 0683217

Browse files
authored
chore: optimize and pin container images (#40)
1 parent ca12967 commit 0683217

5 files changed

Lines changed: 26 additions & 13 deletions

File tree

.github/dependabot.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: docker
4+
directory: /
5+
schedule:
6+
interval: weekly
7+
- package-ecosystem: docker
8+
directory: /api
9+
schedule:
10+
interval: weekly
11+
- package-ecosystem: docker
12+
directory: /dashboard
13+
schedule:
14+
interval: weekly

Dockerfile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
FROM python:3.11-slim
1+
FROM python:3.13-slim@sha256:6771159cd4fa5d9bba1258caf0b82e6b73458c694d178ad97c5e925c2d0e1a91
22

3-
RUN apt-get update && apt-get install -y postgresql-client && rm -rf /var/lib/apt/lists/*
3+
RUN apt-get update \
4+
&& apt-get install -y --no-install-recommends postgresql-client \
5+
&& rm -rf /var/lib/apt/lists/*
46

57
WORKDIR /app
68

@@ -13,10 +15,5 @@ COPY migrations/ ./migrations/
1315
COPY docker-entrypoint.sh .
1416
RUN chmod +x docker-entrypoint.sh
1517

16-
ENV POSTGRES_USER=irish_data
17-
ENV POSTGRES_PASSWORD=secure_password
18-
ENV POSTGRES_DB=ireland_public
19-
ENV DATABASE_URL=postgresql://irish_data:secure_password@db:5432/ireland_public
20-
2118
ENTRYPOINT ["./docker-entrypoint.sh"]
2219
CMD ["python", "daemon.py"]

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pipeline {
1111
}
1212

1313
environment {
14-
DOCKER_BUILDKIT = '0'
14+
DOCKER_BUILDKIT = '1'
1515
COMPOSE_PROJECT_NAME = 'irish-rail-nabber'
1616
ENV_FILE = '/home/semyon/jenkins/env/irish-rail-nabber.env'
1717
CLOUDFLARE_TUNNEL_TOKEN = credentials('cloudflare-tunnel-token')

api/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
FROM rust:slim AS builder
1+
FROM rust:1.91-slim@sha256:f75071363e7f4771769d4cf81b1b7b290e607f4d4459e8731f6abdcee9982dc8 AS builder
22
WORKDIR /app
3-
RUN apt-get update && apt-get install -y pkg-config libssl-dev && rm -rf /var/lib/apt/lists/*
3+
RUN apt-get update \
4+
&& apt-get install -y --no-install-recommends pkg-config libssl-dev \
5+
&& rm -rf /var/lib/apt/lists/*
46
COPY Cargo.toml Cargo.lock ./
57
COPY src/ src/
68
RUN cargo build --release
79

8-
FROM debian:bookworm-slim
10+
FROM debian:bookworm-slim@sha256:7b140f374b289a7c2befc338f42ebe6441b7ea838a042bbd5acbfca6ec875818
911
RUN apt-get update && apt-get install -y ca-certificates curl && rm -rf /var/lib/apt/lists/*
1012
COPY --from=builder /app/target/release/irish-rail-api /usr/local/bin/
1113
EXPOSE 8000

dashboard/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20-slim AS build
1+
FROM node:24-bookworm-slim@sha256:6f7b03f7c2c8e2e784dcf9295400527b9b1270fd37b7e9a7285cf83b6951452d AS build
22
RUN apt-get update \
33
&& apt-get install -y --no-install-recommends ca-certificates \
44
&& rm -rf /var/lib/apt/lists/*
@@ -9,7 +9,7 @@ RUN pnpm install --frozen-lockfile
99
COPY . .
1010
RUN pnpm build
1111

12-
FROM nginx:alpine
12+
FROM nginx:1.28-alpine@sha256:a8b39bd9cf0f83869a2162827a0caf6137ddf759d50a171451b335cecc87d236
1313
COPY --from=build /app/dist /usr/share/nginx/html
1414
COPY nginx.conf /etc/nginx/conf.d/default.conf
1515
EXPOSE 80

0 commit comments

Comments
 (0)