Skip to content

Commit 14e8b6b

Browse files
thisismeonmounteverestthisismeonmounteverest
andauthored
Merging changes to docker setup. (#390)
* Finishing profile pages. * Warmup cache so that translation are available for Javascript. * Warmup cache for test environment to be able to access database. * Fixing code smells. * Working on migration of database content and profile pages. * Fix code smells. --------- Co-authored-by: thisismeonmounteverest <[email protected]>
1 parent 33eea36 commit 14e8b6b

File tree

5 files changed

+32892
-12
lines changed

5 files changed

+32892
-12
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ revision.txt
1818
.sass-cache
1919
doc/
2020
/docker/db/*
21+
!docker/db/word.sql
2122
!docker/db/.gitkeep
2223
docker-compose.override.*
2324
!docker-compose.override.yml.dist

Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
7-
ARG PHP_VERSION=8.5
7+
ARG PHP_VERSION=8.4
88
ARG FRANKENPHP_VERSION=1.11
99

1010

@@ -70,6 +70,7 @@ COPY assets assets/
7070
COPY bin bin/
7171
COPY build build/
7272
COPY config config/
73+
COPY docker docker/
7374
COPY lib lib/
7475
COPY Mike42 Mike42/
7576
COPY modules modules/
@@ -90,10 +91,10 @@ RUN set -eux; \
9091
composer clear-cache
9192

9293
# prevent the reinstallation of node_modules at every changes in the source code
93-
COPY package.json yarn.lock webpack.config.js postcss.config.js tailwind.config.js tsconfig.json ./
94-
RUN set -eux; \
95-
yarn install --frozen-lock; \
96-
yarn encore production --mode=production
94+
#COPY package.json yarn.lock webpack.config.js postcss.config.js tailwind.config.js tsconfig.json ./
95+
#RUN set -eux; \
96+
# yarn install --frozen-lock; \
97+
# yarn encore production --mode=production
9798

9899
# do not use .env files in production
99100
COPY .env ./

0 commit comments

Comments
 (0)