diff --git a/api/src/index.js b/api/src/index.js index 79bca00..2870902 100644 --- a/api/src/index.js +++ b/api/src/index.js @@ -35,6 +35,7 @@ expressWs(app); } } }); + fss.chmodSync(path.join(config.data_directory, globals.data_directories.jobs), 0o711) logger.info('Loading packages'); const pkgdir = path.join( diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml index 25d8fe6..8a0d385 100644 --- a/docker-compose.dev.yaml +++ b/docker-compose.dev.yaml @@ -10,11 +10,11 @@ services: ports: - 2000:2000 volumes: - - ./data/piston:/piston + - ./data/piston/packages:/piston/packages environment: - PISTON_REPO_URL=http://repo:8000/index tmpfs: - - /piston/jobs:exec + - /piston/jobs:exec,uid=1000,gid=1000,mode=711 repo: # Local testing of packages build: repo diff --git a/docker-compose.yaml b/docker-compose.yaml index 83a1383..839b340 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -8,7 +8,7 @@ services: ports: - 2000:2000 volumes: - - ./data/piston:/piston + - ./data/piston/packages:/piston/packages tmpfs: - - /piston/jobs:exec,uid=1000,gid=1000,mode=700 + - /piston/jobs:exec,uid=1000,gid=1000,mode=711 - /tmp:exec diff --git a/piston b/piston index fbd256d..fd83727 100755 --- a/piston +++ b/piston @@ -14,13 +14,6 @@ docker_compose(){ fi } -init_precommit() { - if [ $PISTON_ENV == "dev" ]; then - rm -f .git/hooks/pre-commit - ln -s "$PISTON_PATH/pre-commit" "$PISTON_PATH/.git/hooks/pre-commit" - fi -} - case $1 in help) echo "=== Piston Management ===" @@ -66,14 +59,12 @@ case $1 in restart) docker_compose restart ;; start) - init_precommit docker_compose up -d ;; stop) docker_compose down ;; bash) docker_compose exec api /bin/bash ;; rebuild) - init_precommit docker_compose build && docker_compose up -d ;;