Skip to content

Commit

Permalink
Merge pull request #334 from AmpersandTarski/feature/333-pipeline-doe…
Browse files Browse the repository at this point in the history
…snt-run

Feature/333 pipeline doesnt run
  • Loading branch information
lucsomers101 committed Nov 28, 2023
2 parents 5aea878 + 1ec1324 commit 5b88ca4
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/RAP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: RAP pipeline
on:
push:
branches:
- "main"
- main
paths:
- "./RAP4/"
- "RAP4/**"

jobs:
Staging:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/RAPUsers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: RAP User pipeline
on:
push:
branches:
- "main"
- main
paths:
- "./RAP4USER/"
- "RAP4USER/**"

jobs:
Staging:
Expand Down
1 change: 0 additions & 1 deletion RAP4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ COPY customizations /var/www/
RUN chown -R www-data:www-data /var/www/data /var/www/generics
RUN composer install --prefer-dist --no-dev --profile --optimize-autoloader
RUN npm update
#RUN npm audit fix
RUN npm install
RUN gulp build-ampersand
RUN gulp build-project
11 changes: 9 additions & 2 deletions RAP4USER/README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,29 @@

## Build rap4-student-prototype image

> `docker build -t ampersandtarski/rap4-student-prototype:<version here> .`
## Opstarten container using rap4-student-prototype

NOTE! Backticks need to be escaped when used in windows powershell. Therefore double backticks `` are used in command argument below. A single backtick is needed in the Host() argument.
```

```txt
cat test.adl | docker run --name student123 --rm -i -a stdin --network proxy -e AMPERSAND_DBHOST=db -e AMPERSAND_DBNAME=student123 -l traefik.enable=true -l traefik.http.routers.student123-insecure.rule="Host(``student123.rap.cs.ou.nl``) || Host(``student123.localhost``)" -l student-prototype rap4-student-prototype
```

Also run the following command to attach the new container to the database network. Unfortunately we cannot attach to two networks in docker run command at the same time.
```

```txt
docker network connect rap_db student123
```

## Stop container for specific student

If no container exists with name=student123, docker gives an error. This is not a problem. Just ignore.
> `docker container stop $(docker container ls -q --filter name=student123)`
or
> `docker rm -f student123`
## Stop student prototype containers

> `docker container stop $(docker container ls -q --filter label=student-prototype)`

0 comments on commit 5b88ca4

Please sign in to comment.