Skip to content

Commit 13ed404

Browse files
sandereggsanderegg
authored
🏗️ maintenance: github CI - docker buildx is integrated in docker since version 19.03 (#2163)
* docker buildx is integrated in docker since version 19.03 * remove setup of docker buildx * show docker buildx version * filter files from watchdog
1 parent 4a5956a commit 13ed404

File tree

7 files changed

+12
-79
lines changed

7 files changed

+12
-79
lines changed

‎.github/workflows/ci-release.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ jobs:
2929
run: |
3030
sudo ./ci/github/helpers/setup_docker_compose.bash
3131
./ci/github/helpers/setup_docker_experimental.bash
32-
./ci/github/helpers/setup_docker_buildx.bash
33-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
3432
- name: set owner variable
3533
run: echo "OWNER=${GITHUB_REPOSITORY%/*}" >> $GITHUB_ENV
3634
- name: set git tag

‎.github/workflows/ci-staging.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ jobs:
2525
run: |
2626
sudo ./ci/github/helpers/setup_docker_compose.bash
2727
./ci/github/helpers/setup_docker_experimental.bash
28-
./ci/github/helpers/setup_docker_buildx.bash
29-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
3028
- name: set owner variable
3129
run: echo "OWNER=${GITHUB_REPOSITORY%/*}" >> $GITHUB_ENV
3230
- name: set git tag

‎.github/workflows/ci-testing-deploy.yml‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ jobs:
4848
run: |
4949
sudo ./ci/github/helpers/setup_docker_compose.bash
5050
./ci/github/helpers/setup_docker_experimental.bash
51-
./ci/github/helpers/setup_docker_buildx.bash
52-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
5351
- name: setup python environment
5452
uses: actions/setup-python@v2
5553
with:
@@ -84,8 +82,6 @@ jobs:
8482
run: |
8583
sudo ./ci/github/helpers/setup_docker_compose.bash
8684
./ci/github/helpers/setup_docker_experimental.bash
87-
./ci/github/helpers/setup_docker_buildx.bash
88-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
8985
- name: setup python environment
9086
uses: actions/setup-python@v2
9187
with:
@@ -133,8 +129,6 @@ jobs:
133129
run: |
134130
sudo ./ci/github/helpers/setup_docker_compose.bash
135131
./ci/github/helpers/setup_docker_experimental.bash
136-
./ci/github/helpers/setup_docker_buildx.bash
137-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
138132
- name: setup python environment
139133
uses: actions/setup-python@v2
140134
with:
@@ -188,8 +182,6 @@ jobs:
188182
run: |
189183
sudo ./ci/github/helpers/setup_docker_compose.bash
190184
./ci/github/helpers/setup_docker_experimental.bash
191-
./ci/github/helpers/setup_docker_buildx.bash
192-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
193185
- name: setup python environment
194186
uses: actions/setup-python@v2
195187
with:
@@ -237,8 +229,6 @@ jobs:
237229
run: |
238230
sudo ./ci/github/helpers/setup_docker_compose.bash
239231
./ci/github/helpers/setup_docker_experimental.bash
240-
./ci/github/helpers/setup_docker_buildx.bash
241-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
242232
- name: setup python environment
243233
uses: actions/setup-python@v2
244234
with:
@@ -290,8 +280,6 @@ jobs:
290280
run: |
291281
sudo ./ci/github/helpers/setup_docker_compose.bash
292282
./ci/github/helpers/setup_docker_experimental.bash
293-
./ci/github/helpers/setup_docker_buildx.bash
294-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
295283
- name: setup python environment
296284
uses: actions/setup-python@v2
297285
with:
@@ -339,8 +327,6 @@ jobs:
339327
run: |
340328
sudo ./ci/github/helpers/setup_docker_compose.bash
341329
./ci/github/helpers/setup_docker_experimental.bash
342-
./ci/github/helpers/setup_docker_buildx.bash
343-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
344330
- uses: actions/setup-node@v1
345331
with:
346332
node-version: ${{ matrix.node }}
@@ -369,8 +355,6 @@ jobs:
369355
run: |
370356
sudo ./ci/github/helpers/setup_docker_compose.bash
371357
./ci/github/helpers/setup_docker_experimental.bash
372-
./ci/github/helpers/setup_docker_buildx.bash
373-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
374358
- name: setup python environment
375359
uses: actions/setup-python@v2
376360
with:
@@ -405,8 +389,6 @@ jobs:
405389
run: |
406390
sudo ./ci/github/helpers/setup_docker_compose.bash
407391
./ci/github/helpers/setup_docker_experimental.bash
408-
./ci/github/helpers/setup_docker_buildx.bash
409-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
410392
- name: setup python environment
411393
uses: actions/setup-python@v2
412394
with:
@@ -455,8 +437,6 @@ jobs:
455437
run: |
456438
sudo ./ci/github/helpers/setup_docker_compose.bash
457439
./ci/github/helpers/setup_docker_experimental.bash
458-
./ci/github/helpers/setup_docker_buildx.bash
459-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
460440
- name: setup python environment
461441
uses: actions/setup-python@v2
462442
with:
@@ -504,8 +484,6 @@ jobs:
504484
run: |
505485
sudo ./ci/github/helpers/setup_docker_compose.bash
506486
./ci/github/helpers/setup_docker_experimental.bash
507-
./ci/github/helpers/setup_docker_buildx.bash
508-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
509487
- name: setup python environment
510488
uses: actions/setup-python@v2
511489
with:
@@ -553,8 +531,6 @@ jobs:
553531
run: |
554532
sudo ./ci/github/helpers/setup_docker_compose.bash
555533
./ci/github/helpers/setup_docker_experimental.bash
556-
./ci/github/helpers/setup_docker_buildx.bash
557-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
558534
- name: setup python environment
559535
uses: actions/setup-python@v2
560536
with:
@@ -602,8 +578,6 @@ jobs:
602578
run: |
603579
sudo ./ci/github/helpers/setup_docker_compose.bash
604580
./ci/github/helpers/setup_docker_experimental.bash
605-
./ci/github/helpers/setup_docker_buildx.bash
606-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
607581
- name: setup python environment
608582
uses: actions/setup-python@v2
609583
with:
@@ -651,8 +625,6 @@ jobs:
651625
run: |
652626
sudo ./ci/github/helpers/setup_docker_compose.bash
653627
./ci/github/helpers/setup_docker_experimental.bash
654-
./ci/github/helpers/setup_docker_buildx.bash
655-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
656628
- name: setup python environment
657629
uses: actions/setup-python@v2
658630
with:
@@ -701,8 +673,6 @@ jobs:
701673
run: |
702674
sudo ./ci/github/helpers/setup_docker_compose.bash
703675
./ci/github/helpers/setup_docker_experimental.bash
704-
./ci/github/helpers/setup_docker_buildx.bash
705-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
706676
- name: setup python environment
707677
uses: actions/setup-python@v2
708678
with:
@@ -751,8 +721,6 @@ jobs:
751721
run: |
752722
sudo ./ci/github/helpers/setup_docker_compose.bash
753723
./ci/github/helpers/setup_docker_experimental.bash
754-
./ci/github/helpers/setup_docker_buildx.bash
755-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
756724
- name: setup python environment
757725
uses: actions/setup-python@v2
758726
with:
@@ -801,8 +769,6 @@ jobs:
801769
run: |
802770
sudo ./ci/github/helpers/setup_docker_compose.bash
803771
./ci/github/helpers/setup_docker_experimental.bash
804-
./ci/github/helpers/setup_docker_buildx.bash
805-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
806772
- name: setup python environment
807773
uses: actions/setup-python@v2
808774
with:
@@ -851,8 +817,6 @@ jobs:
851817
run: |
852818
sudo ./ci/github/helpers/setup_docker_compose.bash
853819
./ci/github/helpers/setup_docker_experimental.bash
854-
./ci/github/helpers/setup_docker_buildx.bash
855-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
856820
- name: setup python environment
857821
uses: actions/setup-python@v2
858822
with:
@@ -897,8 +861,6 @@ jobs:
897861
run: |
898862
sudo ./ci/github/helpers/setup_docker_compose.bash
899863
./ci/github/helpers/setup_docker_experimental.bash
900-
./ci/github/helpers/setup_docker_buildx.bash
901-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
902864
- name: show system environs
903865
if: github.event_name == 'push'
904866
run: ./ci/helpers/show_system_versions.bash
@@ -937,8 +899,6 @@ jobs:
937899
run: |
938900
sudo ./ci/github/helpers/setup_docker_compose.bash
939901
./ci/github/helpers/setup_docker_experimental.bash
940-
./ci/github/helpers/setup_docker_buildx.bash
941-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
942902
- name: setup python environment
943903
uses: actions/setup-python@v2
944904
with:
@@ -1002,8 +962,6 @@ jobs:
1002962
run: |
1003963
sudo ./ci/github/helpers/setup_docker_compose.bash
1004964
./ci/github/helpers/setup_docker_experimental.bash
1005-
./ci/github/helpers/setup_docker_buildx.bash
1006-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
1007965
- name: setup python environment
1008966
uses: actions/setup-python@v2
1009967
with:
@@ -1067,8 +1025,6 @@ jobs:
10671025
run: |
10681026
sudo ./ci/github/helpers/setup_docker_compose.bash
10691027
./ci/github/helpers/setup_docker_experimental.bash
1070-
./ci/github/helpers/setup_docker_buildx.bash
1071-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
10721028
- name: setup python environment
10731029
uses: actions/setup-python@v2
10741030
with:
@@ -1132,8 +1088,6 @@ jobs:
11321088
run: |
11331089
sudo ./ci/github/helpers/setup_docker_compose.bash
11341090
./ci/github/helpers/setup_docker_experimental.bash
1135-
./ci/github/helpers/setup_docker_buildx.bash
1136-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
11371091
- name: setup python environment
11381092
uses: actions/setup-python@v2
11391093
with:
@@ -1197,8 +1151,6 @@ jobs:
11971151
run: |
11981152
sudo ./ci/github/helpers/setup_docker_compose.bash
11991153
./ci/github/helpers/setup_docker_experimental.bash
1200-
./ci/github/helpers/setup_docker_buildx.bash
1201-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
12021154
- name: setup python environment
12031155
uses: actions/setup-python@v2
12041156
with:
@@ -1243,8 +1195,6 @@ jobs:
12431195
run: |
12441196
sudo ./ci/github/helpers/setup_docker_compose.bash
12451197
./ci/github/helpers/setup_docker_experimental.bash
1246-
./ci/github/helpers/setup_docker_buildx.bash
1247-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
12481198
- name: setup python environment
12491199
uses: actions/setup-python@v2
12501200
with:
@@ -1290,8 +1240,6 @@ jobs:
12901240
run: |
12911241
sudo ./ci/github/helpers/setup_docker_compose.bash
12921242
./ci/github/helpers/setup_docker_experimental.bash
1293-
./ci/github/helpers/setup_docker_buildx.bash
1294-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
12951243
- name: setup python environment
12961244
uses: actions/setup-python@v2
12971245
with:
@@ -1533,8 +1481,6 @@ jobs:
15331481
run: |
15341482
sudo ./ci/github/helpers/setup_docker_compose.bash
15351483
./ci/github/helpers/setup_docker_experimental.bash
1536-
./ci/github/helpers/setup_docker_buildx.bash
1537-
echo "DOCKER_BUILDX=1" >> $GITHUB_ENV
15381484
- name: set owner variable
15391485
run: echo "OWNER=${GITHUB_REPOSITORY%/*}" >> $GITHUB_ENV
15401486
- name: deploy master

‎ci/github/helpers/setup_docker_buildx.bash‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎ci/helpers/show_system_versions.bash‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22
# http://redsymbol.net/articles/unofficial-bash-strict-mode/
3-
set -o errexit # abort on nonzero exitstatus
4-
set -o nounset # abort on unbound variable
5-
set -o pipefail # don't hide errors within pipes
3+
set -o errexit # abort on nonzero exitstatus
4+
set -o nounset # abort on unbound variable
5+
set -o pipefail # don't hide errors within pipes
66
IFS=$'\n\t'
77

88
echo "------------------------------ environs -----------------------------------"
@@ -27,6 +27,11 @@ if command -v docker; then
2727
docker version
2828
fi
2929

30+
echo "------------------------------ docker buildx-----------------------------------"
31+
if command -v docker; then
32+
docker buildx version
33+
fi
34+
3035
echo "------------------------------ docker-compose -----------------------------------"
3136
if command -v docker-compose; then
3237
docker-compose version

‎services/catalog/docker/boot.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
2626
fi
2727

2828
# RUNNING application ----------------------------------------
29-
if [ "${SC_BOOT_MODE}" = "debug-ptvsd" ]
30-
then
29+
if [ "${SC_BOOT_MODE}" = "debug-ptvsd" ]; then
3130
# NOTE: ptvsd is programmatically enabled inside of the service
3231
# this way we can have reload in place as well
33-
exec uvicorn simcore_service_catalog.__main__:the_app --reload --host 0.0.0.0
32+
exec uvicorn simcore_service_catalog.__main__:the_app --reload --host 0.0.0.0 --reload-dir services/catalog/src/simcore_service_catalog
3433
else
3534
exec simcore-service-catalog
3635
fi

‎services/director-v2/docker/boot.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,13 @@ if [ "${SC_BUILD_TARGET}" = "development" ]; then
3030
pip list | sed 's/^/ /'
3131
fi
3232

33-
3433
#
3534
# RUNNING application
3635
#
37-
if [ "${SC_BOOT_MODE}" = "debug-ptvsd" ]
38-
then
36+
if [ "${SC_BOOT_MODE}" = "debug-ptvsd" ]; then
3937
# NOTE: ptvsd is programmatically enabled inside of the service
4038
# this way we can have reload in place as well
41-
exec uvicorn simcore_service_director_v2.__main__:the_app --reload --host 0.0.0.0
39+
exec uvicorn simcore_service_director_v2.__main__:the_app --reload --host 0.0.0.0 --reload-dir services/director-v2/src/simcore_service_director_v2
4240
else
4341
exec simcore-service-director-v2
4442
fi

0 commit comments

Comments
 (0)