Skip to content

Commit

Permalink
fix: fix codec persistence add codec volume to test docker-compose (#70)
Browse files Browse the repository at this point in the history
Prior to this fix codec key file was managed by external docker orchestrator like docker-compose + explicit file permissions to host this file. Hence this change will add natively support of codec persistence inside the docker image

(cherry picked from commit b06c5d2)
(cherry picked from commit 48345cd)
  • Loading branch information
hbenali committed Dec 23, 2024
1 parent 25ca392 commit de5c1f7
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ ARG ARCHIVE_BASE_DIR=platform-${EXO_VERSION}

ENV EXO_APP_DIR=/opt/exo
ENV EXO_CONF_DIR=/etc/exo
ENV EXO_CODEC_DIR=/etc/exo/codec
ENV EXO_DATA_DIR=/srv/exo
ENV EXO_SHARED_DATA_DIR=/srv/exo/shared
ENV EXO_LOG_DIR=/var/log/exo
Expand Down Expand Up @@ -70,6 +71,7 @@ RUN if [ -n "${DOWNLOAD_USER}" ]; then PARAMS="-u ${DOWNLOAD_USER}"; fi && \
mv /srv/downloads/${ARCHIVE_BASE_DIR} ${EXO_APP_DIR} && \
chown -R ${EXO_USER}:${EXO_GROUP} ${EXO_APP_DIR} && \
ln -s ${EXO_APP_DIR}/gatein/conf /etc/exo && \
mkdir -p ${EXO_CODEC_DIR} && chown ${EXO_USER}:${EXO_GROUP} ${EXO_CODEC_DIR} && \
rm -rf ${EXO_APP_DIR}/logs && ln -s ${EXO_LOG_DIR} ${EXO_APP_DIR}/logs

# Add wait-for
Expand Down
11 changes: 11 additions & 0 deletions test/common-plf70-stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ services:
- "8080"
volumes:
- exo_data:/srv/exo
<<<<<<< HEAD
=======
- exo_codec:/etc/exo/codec
>>>>>>> 48345cd (fix: fix codec persistence add codec volume to test docker-compose (#70))
- exo_logs:/var/log/exo
networks:
- front
Expand All @@ -47,14 +51,21 @@ services:
networks:
- back
mysql:
<<<<<<< HEAD
image: mysql:8.0
=======
image: mysql:8.4.3
>>>>>>> 48345cd (fix: fix codec persistence add codec volume to test docker-compose (#70))
environment:
MYSQL_ROOT_PASSWORD: my-secret-pw
MYSQL_DATABASE: exo
MYSQL_USER: exo
MYSQL_PASSWORD: exo
<<<<<<< HEAD
# mysql native password is needed to avoid ssl key errors with the default configuration
command: --default-authentication-plugin=mysql_native_password
=======
>>>>>>> 48345cd (fix: fix codec persistence add codec volume to test docker-compose (#70))
volumes:
- db_data:/var/lib/mysql:rw
networks:
Expand Down
4 changes: 4 additions & 0 deletions test/docker-compose-70-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ services:
- mongo
volumes:
exo_data:
<<<<<<< HEAD
=======
exo_codec:
>>>>>>> 48345cd (fix: fix codec persistence add codec volume to test docker-compose (#70))
exo_logs:
db_data:
mongo_data:
Expand Down
4 changes: 4 additions & 0 deletions test/docker-compose-70-pgsql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ services:
- mongo
volumes:
exo_data:
<<<<<<< HEAD
=======
exo_codec:
>>>>>>> 48345cd (fix: fix codec persistence add codec volume to test docker-compose (#70))
exo_logs:
db_data:
mongo_data:
Expand Down

0 comments on commit de5c1f7

Please sign in to comment.