Skip to content

Commit

Permalink
Merge pull request #68 from haz/main
Browse files Browse the repository at this point in the history
Run MySQL in user space
  • Loading branch information
nirlipo authored Aug 14, 2024
2 parents 8d3895d + d0ceb12 commit 5b93fbe
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
8 changes: 6 additions & 2 deletions server/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@

all : build-planutils-image build-start

build-planutils-image:
docker build -t paas:latest .

build-start: # install and start
docker compose --compatibility up -d --build
db-data:
mkdir -p db_data

build-start: db-data
CURRENT_USER_ID="$(shell id -u)" CURRENT_GROUP_ID="$(shell id -g)" docker compose --compatibility up -d --build
3 changes: 1 addition & 2 deletions server/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
services:
frontend:
privileged: true
build:
context: ./frontend
dockerfile: Dockerfile
Expand All @@ -11,7 +10,6 @@ services:
# volumes:
# - /etc/letsencrypt:/etc/letsencrypt
web:
privileged: true
build:
context: ./api
dockerfile: Dockerfile
Expand Down Expand Up @@ -75,3 +73,4 @@ services:
volumes:
- ./init:/docker-entrypoint-initdb.d
- ./db_data:/var/lib/mysql
user: ${CURRENT_USER_ID:-1000}:${CURRENT_GROUP_ID:-1000}

0 comments on commit 5b93fbe

Please sign in to comment.