Skip to content

Commit 38a1c18

Browse files
committed
chore
1 parent 339da40 commit 38a1c18

1 file changed

Lines changed: 48 additions & 48 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -42,51 +42,51 @@ jobs:
4242
TESTCONTAINERS_RYUK_DISABLED: true
4343
run: npm run test:with-compose
4444

45-
# test-inside-docker:
46-
# name: Tests - Running Inside Container (Docker-in-Docker)
47-
# runs-on: ubuntu-latest
48-
49-
# steps:
50-
# - name: Checkout code
51-
# uses: actions/checkout@v4
52-
53-
# - name: Set up Docker Buildx
54-
# uses: docker/setup-buildx-action@v3
55-
56-
# - name: Create Docker config file
57-
# run: |
58-
# mkdir -p ~/.docker
59-
# echo '${{ secrets.DOCKER_CONFIG_JSON }}' > ~/.docker/config-read.json
60-
61-
# - name: Get user and docker group IDs
62-
# id: get-ids
63-
# run: |
64-
# echo "user_id=$(id -u)" >> $GITHUB_OUTPUT
65-
# echo "docker_gid=$(getent group docker | cut -d: -f3)" >> $GITHUB_OUTPUT
66-
# echo "Current user ID: $(id -u)"
67-
# echo "Docker group ID: $(getent group docker | cut -d: -f3)"
68-
69-
# - name: Start test container with docker compose
70-
# working-directory: ./src/16-docker-outside-of-docker
71-
# env:
72-
# USER_ID: ${{ steps.get-ids.outputs.user_id }}
73-
# DOCKER_GROUP_ID: ${{ steps.get-ids.outputs.docker_gid }}
74-
# run: docker compose up -d
75-
76-
# - name: Install dependencies inside container
77-
# working-directory: ./src/16-docker-outside-of-docker
78-
# run: docker compose exec -T tests npm install
79-
80-
# - name: Run tests - Container reuse without compose (inside container)
81-
# working-directory: ./src/16-docker-outside-of-docker
82-
# run: |
83-
# docker compose exec -T \
84-
# -e TESTCONTAINERS_RYUK_DISABLED=true \
85-
# tests npm run test:without-compose
86-
87-
# - name: Run tests - Container reuse with compose (inside container)
88-
# working-directory: ./src/16-docker-outside-of-docker
89-
# run: |
90-
# docker compose exec -T \
91-
# -e TESTCONTAINERS_RYUK_DISABLED=true \
92-
# tests npm run test:with-compose
45+
test-inside-docker:
46+
name: Tests - Running Inside Container (Docker-in-Docker)
47+
runs-on: ubuntu-latest
48+
49+
steps:
50+
- name: Checkout code
51+
uses: actions/checkout@v4
52+
53+
- name: Set up Docker Buildx
54+
uses: docker/setup-buildx-action@v3
55+
56+
- name: Create Docker config file
57+
run: |
58+
mkdir -p ~/.docker
59+
echo '${{ secrets.DOCKER_CONFIG_JSON }}' > ~/.docker/config-read.json
60+
61+
- name: Get user and docker group IDs
62+
id: get-ids
63+
run: |
64+
echo "user_id=$(id -u)" >> $GITHUB_OUTPUT
65+
echo "docker_gid=$(getent group docker | cut -d: -f3)" >> $GITHUB_OUTPUT
66+
echo "Current user ID: $(id -u)"
67+
echo "Docker group ID: $(getent group docker | cut -d: -f3)"
68+
69+
- name: Start test container with docker compose
70+
working-directory: ./src/16-docker-outside-of-docker
71+
env:
72+
USER_ID: ${{ steps.get-ids.outputs.user_id }}
73+
DOCKER_GROUP_ID: ${{ steps.get-ids.outputs.docker_gid }}
74+
run: docker compose up -d
75+
76+
- name: Install dependencies inside container
77+
working-directory: ./src/16-docker-outside-of-docker
78+
run: docker compose exec -T tests npm install
79+
80+
- name: Run tests - Container reuse without compose (inside container)
81+
working-directory: ./src/16-docker-outside-of-docker
82+
run: |
83+
docker compose exec -T \
84+
-e TESTCONTAINERS_RYUK_DISABLED=true \
85+
tests npm run test:without-compose
86+
87+
- name: Run tests - Container reuse with compose (inside container)
88+
working-directory: ./src/16-docker-outside-of-docker
89+
run: |
90+
docker compose exec -T \
91+
-e TESTCONTAINERS_RYUK_DISABLED=true \
92+
tests npm run test:with-compose

0 commit comments

Comments
 (0)