diff --git a/.gitignore b/.gitignore index 7cebb46..59906af 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .idea/ .env database-cache/ +website/database-cache/ diff --git a/docker-compose.yaml b/docker-compose.yaml index 8c53993..cbc8d56 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -35,7 +35,7 @@ services: MQTT_HOST: rmqtt MQTT_PORT: 11883 volumes: - - ./database-cache:/var/cache/cheburcheck/databases + - database-cache:/var/cache/cheburcheck/databases expose: - "8000" @@ -51,3 +51,6 @@ services: - "1883" - "11883" - "6060" + +volumes: + database-cache: diff --git a/website/Dockerfile b/website/Dockerfile index 4ddffbe..d94d1b1 100644 --- a/website/Dockerfile +++ b/website/Dockerfile @@ -29,7 +29,9 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ apt-get install -y --no-install-recommends libssl3 ca-certificates curl && \ rm -rf /var/lib/apt/lists/* && \ groupadd --system app && \ - useradd --system --gid app --home-dir /app --shell /usr/sbin/nologin app + useradd --system --gid app --home-dir /app --shell /usr/sbin/nologin app && \ + mkdir -p /var/cache/cheburcheck/databases && \ + chown -R app:app /var/cache/cheburcheck COPY --from=build /build/website/Rocket.toml ./ COPY --from=build /build/main ./