diff options
| author |  Christopher Baklid <[email protected]> | 2018-06-05 21:08:18 +0200 |
|---|---|---|
| committer | Christopher Baklid <[email protected]> | 2018-06-05 21:08:18 +0200 |
| commit | c889d321500e4ffea74042607b5b40dcc3aab5ab (patch) | |
| tree | 3ced7c98a7568af25078e6e9ff7b6b27db9c35dc | |
| parent | no bash on alpine (diff) | |
remove scripts, more pipfile commands
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | Pipfile | 2 | ||||
| -rw-r--r-- | scripts/ci.sh | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index efbe5b9..232ae1d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,5 @@ stages: build: stage: build script: - - chmod +x scripts/ci.sh - - sh scripts/ci.sh - pipenv run lint - pipenv run test @@ -31,6 +31,8 @@ snekweb = "gunicorn -w 2 -b 0.0.0.0:5000 --log-level debug -k geventwebsocket.gu buildbox = "docker build -t pythondiscord/snekbox:latest -f docker/Dockerfile ." pushbox = "docker push pythondiscord/snekbox:latest" + +buildboxbase = "docker build -t pythondiscord/snekbox-base:latest -f docker/base.Dockerfile ." pushboxbase = "docker push pythondiscord/snekbox-base:latest" buildweb = "docker build -t pythondiscord/snekboxweb:latest -f docker/Dockerfile.webapp ." diff --git a/scripts/ci.sh b/scripts/ci.sh deleted file mode 100644 index edf5295..0000000 --- a/scripts/ci.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -chmod +x binaries/nsjail2.6-ubuntu-x86_64 |