Skip to content

Commit

Permalink
try new docker test
Browse files Browse the repository at this point in the history
  • Loading branch information
dmou committed Sep 20, 2024
1 parent eee4625 commit 2a954d1
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-test-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
- name: Run container
id: run-container
run: |
docker compose -f docker-compose.yml -f docker-test.yml up -d pender
docker compose -f docker-test.yml up -d pender
- name: Set up PR Tests
id: setup-tests
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN gem install bundler -v "${BUNDLER_VERSION}" --no-document \
&& bundle install --jobs 20 --retry 5
COPY ./ .
COPY bin/ /opt/bin/
RUN mkdir -p /opt/db/
RUN mkdir -p /opt/db

USER ${APP}

Expand Down
50 changes: 49 additions & 1 deletion docker-test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,53 @@
version: "2.2"
volumes:
redis:
minio:
postgres13:
services:
redis:
image: redis:6.2
ports:
- "6379:6379"
volumes:
- "redis:/data"
minio:
image: minio/minio
command: server /data
ports:
- "9000:9000"
volumes:
- "minio:/data"
environment:
MINIO_ACCESS_KEY: AKIAIOSFODNN7EXAMPLE
MINIO_SECRET_KEY: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
postgres:
image: postgres:13-buster
ports:
- "5432:5432"
environment:
POSTGRES_PASSWORD: postgres
POSTGRES_USER: postgres
# POSTGRES_DB: pender-tests
POSTGRES_DB: pender_test__db
pender:
env_file:
- .env
build: .
shm_size: 1G
ports:
- "3200:3200"
- "9555:9555"
depends_on:
- postgres
- redis
- minio
environment:
APP: pender
DEPLOY_ENV: local
RAILS_ENV: test
SERVER_PORT: 3200
otel-collector:
image: otel/opentelemetry-collector-contrib
volumes:
- ./config/otel-collector-config.yaml:/etc/otelcol-contrib/config.yaml
depends_on:
- pender
2 changes: 0 additions & 2 deletions test/setup-parallel
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ FAIL=0

echo `whoami`
ls -al tmp
echo "--"

rm -rf /tmp/cache /tmp/cache1 /tmp/cache2 /tmp/cache3
mkdir -p /tmp/cache /tmp/cache1 /tmp/cache2 /tmp/cache3
mkdir -p /opt/db
Expand Down

0 comments on commit 2a954d1

Please sign in to comment.