Skip to content

Commit

Permalink
remove unnecessary things
Browse files Browse the repository at this point in the history
  • Loading branch information
finlay-jisc committed Nov 19, 2024
1 parent 0503134 commit 65915e7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/api-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
run: |
export SERVERLESS_LICENSE_KEY=`aws ssm get-parameter --name ${{ secrets.SERVERLESS_LICENSE_KEY_SSM_PARAMETER_ARN }} --query "Parameter.Value" --output text`
printenv
docker compose -f "docker-compose.yml" up -d --build
docker compose up -d --build
- name: Wait for API and DB to be ready
run: docker exec -t api-test dockerize -wait tcp://db:5432 -wait tcp://api-test:4003 -wait tcp://mailpit:8025 -wait tcp://localstack:4566 -timeout 120s
Expand All @@ -58,4 +58,4 @@ jobs:

- name: Stop containers
working-directory: ./api
run: docker compose -f docker-compose.yml down
run: docker compose down
3 changes: 0 additions & 3 deletions api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
&& tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz

# Create a dummy set of credentials and config for test
RUN mkdir /root/.aws && echo '[octopus-docker]\naws_access_key_id=setkey\naws_secret_access_key=asecret' >/root/.aws/credentials && echo '[profile octopus-docker]\nregion=eu-west-1' >/root/.aws/config

# Create and move to app directory
RUN mkdir -p /app
WORKDIR /app
Expand Down

0 comments on commit 65915e7

Please sign in to comment.