Skip to content

Commit 06a741c

Browse files
committed
rename docker-compose.yaml -> docker-compose.build.yaml
Signed-off-by: Nobuhiro MIKI <nob@bobuhiro11.net>
1 parent 717f085 commit 06a741c

2 files changed

Lines changed: 19 additions & 23 deletions

File tree

.github/workflows/action.yaml

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,26 @@ jobs:
2020
- uses: actions/checkout@v2
2121
- name: Init docker-compose
2222
run: |
23-
docker-compose up -d
23+
docker-compose --file docker-compose.build.yaml up -d
2424
sleep 1800
25-
- name: Exec OpenStack CLI
25+
- name: Build Images
2626
run: |
27-
docker-compose logs -t --tail=100
28-
docker-compose exec -T --user stack controller /bin/bash -c \
27+
docker-compose --file docker-compose.build.yaml logs -t --tail=100
28+
docker-compose --file docker-compose.build.yaml exec -T --user stack controller /bin/bash -c \
2929
'openstack compute service list'
3030
net_id=$(docker-compose exec -T --user stack controller /bin/bash -c \
3131
'openstack network show private -f json 2>/dev/null | jq -r .id' | tr -d "\r\n")
32-
docker-compose exec -T --user stack controller /bin/bash -c \
32+
docker-compose --file docker-compose.build.yaml exec -T --user stack controller /bin/bash -c \
3333
"nova boot --image cirros-0.5.2-x86_64-disk --flavor m1.medium --nic net-id=$net_id testvm"
3434
sleep 10
35-
docker-compose exec -T --user stack controller /bin/bash -c \
35+
docker-compose --file docker-compose.build.yaml exec -T --user stack controller /bin/bash -c \
3636
"nova list"
37-
docker-compose exec -T --user stack controller /bin/bash -c \
37+
docker-compose --file docker-compose.build.yaml exec -T --user stack controller /bin/bash -c \
3838
"nova list" | grep ACTIVE
39-
docker-compose exec -T controller /bin/bash -c "systemctl disable devstack"
40-
docker-compose exec -T compute-1 /bin/bash -c "systemctl disable devstack"
41-
docker-compose exec -T compute-2 /bin/bash -c "systemctl disable devstack"
42-
docker-compose stop
39+
for c in controller compute-1 compute-2; do
40+
docker-compose --file docker-compose.build.yaml exec -T $c /bin/bash -c "systemctl disable devstack"
41+
done
42+
docker-compose --file docker-compose.build.yaml stop
4343
docker ps -a
4444
- name: Login to Docker Hub
4545
uses: docker/login-action@v2
@@ -49,18 +49,14 @@ jobs:
4949
- name: Push to Docker Hub for PR
5050
if: github.ref != 'refs/heads/main' && github.event_name != 'schedule'
5151
run: |
52-
docker commit controller bobuhiro11/containerized-devstack-controller:${{ github.sha }}
53-
docker commit compute-1 bobuhiro11/containerized-devstack-compute-1:${{ github.sha }}
54-
docker commit compute-2 bobuhiro11/containerized-devstack-compute-2:${{ github.sha }}
55-
docker push bobuhiro11/containerized-devstack-controller:${{ github.sha }}
56-
docker push bobuhiro11/containerized-devstack-compute-1:${{ github.sha }}
57-
docker push bobuhiro11/containerized-devstack-compute-2:${{ github.sha }}
52+
for c in controller compute-1 compute-2; do
53+
docker commit $c bobuhiro11/containerized-devstack-$c:${{ github.sha }}
54+
docker push bobuhiro11/containerized-devstack-$c:${{ github.sha }}
55+
done
5856
- name: Push to Docker Hub for latest
5957
if: github.ref == 'refs/heads/main' && github.event_name != 'schedule'
6058
run: |
61-
docker commit controller bobuhiro11/containerized-devstack-controller:latest
62-
docker commit compute-1 bobuhiro11/containerized-devstack-compute-1:latest
63-
docker commit compute-2 bobuhiro11/containerized-devstack-compute-2:latest
64-
docker push bobuhiro11/containerized-devstack-controller:latest
65-
docker push bobuhiro11/containerized-devstack-compute-1:latest
66-
docker push bobuhiro11/containerized-devstack-compute-2:latest
59+
for c in controller compute-1 compute-2; do
60+
docker commit $c bobuhiro11/containerized-devstack-$c:latest
61+
docker push bobuhiro11/containerized-devstack-$c:latest
62+
done

0 commit comments

Comments
 (0)