dalphinloser/odoocker
1
0
Fork 0
mirror of https://github.com/odoocker/odoocker synced 2025-11-04 15:19:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:odoocker/odoocker into main

Browse Source
This commit is contained in:
Yhael S
2023-10-22 02:17:48 -05:00
parent 0c2b41aed3 bd65372798
commit f83c8aed1c
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@@ -173,8 +173,6 @@ services:
dockerfile: ./pgadmin/Dockerfile dockerfile: ./pgadmin/Dockerfile
args: args:
- PGADMIN_TAG - PGADMIN_TAG
depends_on:
- postgres
restart: 'no' restart: 'no'
expose: expose:
- 80 - 80

9
pgadmin/Dockerfile
View File

@@ -15,9 +15,12 @@ USER root
# Install bash # Install bash
RUN apk add --no-cache bash jq sqlite RUN apk add --no-cache bash jq sqlite
# Conditionally copy the private key if it exists # Check if the private key exists, copy it and set permissions if it does
COPY --chown=pgadmin:root ./pgadmin/private_key /pgadmin4/private_key RUN if [ -f ./pgadmin/private_key ]; then \
# Set permissions for the private key cp ./pgadmin/private_key /pgadmin4/private_key && \
chown pgadmin:root /pgadmin4/private_key && \
chmod 600 /pgadmin4/private_key; \
fi
# Copy your script file into the Docker image # Copy your script file into the Docker image
COPY --chown=pgadmin:root ./.env / COPY --chown=pgadmin:root ./.env /

3
pgadmin/start_pgadmin.sh
View File

@@ -19,9 +19,6 @@ DIR_NAME="/var/lib/pgadmin/storage/${PGADMIN_DEFAULT_EMAIL//@/_}"
# Create the directory using the modified name # Create the directory using the modified name
mkdir -p "$DIR_NAME" mkdir -p "$DIR_NAME"
cp /pgadmin4/private_key "$DIR_NAME/private_key"
chown -R pgadmin:root "$DIR_NAME/private_key"
# Generate JSON for each matching variable # Generate JSON for each matching variable
DB_PATH="/var/lib/pgadmin/pgadmin4.db" DB_PATH="/var/lib/pgadmin/pgadmin4.db"
json_output="{\"Servers\":{" json_output="{\"Servers\":{"