Skip to content

Commit 836e582

Browse files
committed
fix: remove glibc tester, use new docker, no compose
1 parent a9940bc commit 836e582

File tree

6 files changed

+3
-53
lines changed

6 files changed

+3
-53
lines changed

.semaphore/deploy.latest.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ blocks:
4444
- name: tester
4545
commands:
4646
- ./build.sh -a tester -f node/Dockerfile.tester -v $NODE_VERSION -p
47-
- name: tester-glibc
48-
commands:
49-
- ./build.sh -a tester-glibc -f node/Dockerfile.tester-glibc -v $NODE_VERSION -p
5047
- name: ssh
5148
commands:
5249
- ./build.sh -a ssh -f node-ssh/Dockerfile -v $NODE_VERSION -p
@@ -111,9 +108,6 @@ blocks:
111108
- checkout
112109
- echo $DOCKER_PASSWORD | docker login --username $DOCKER_USERNAME --password-stdin
113110
jobs:
114-
- name: vips-tester-glibc
115-
commands:
116-
- ./build.sh -a vips-tester-glibc -f node-vips/Dockerfile.tester-glibc -v $NODE_VERSION -p
117111
- name: vips-tester-chrome
118112
commands:
119113
- ./build.sh -a vips-tester-chrome -f node-vips/Dockerfile.tester-chrome -v $NODE_VERSION -p

.semaphore/deploy.lts.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ blocks:
4444
- name: tester
4545
commands:
4646
- ./build.sh -a tester -f node/Dockerfile.tester -v $NODE_VERSION -p
47-
- name: tester-glibc
48-
commands:
49-
- ./build.sh -a tester-glibc -f node/Dockerfile.tester-glibc -v $NODE_VERSION -p
5047
- name: ssh
5148
commands:
5249
- ./build.sh -a ssh -f node-ssh/Dockerfile -v $NODE_VERSION -p
@@ -111,9 +108,6 @@ blocks:
111108
- checkout
112109
- echo $DOCKER_PASSWORD | docker login --username $DOCKER_USERNAME --password-stdin
113110
jobs:
114-
- name: vips-tester-glibc
115-
commands:
116-
- ./build.sh -a vips-tester-glibc -f node-vips/Dockerfile.tester-glibc -v $NODE_VERSION -p
117111
- name: vips-tester-chrome
118112
commands:
119113
- ./build.sh -a vips-tester-chrome -f node-vips/Dockerfile.tester-chrome -v $NODE_VERSION -p

_legacy/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ rm -rf ./*.log
3131
docker-build $BASE_NAME -f node/Dockerfile .
3232
docker-build -v "onbuild" $BASE_NAME -f node/Dockerfile.onbuild .
3333
docker-build -v "tester" $BASE_NAME -f node/Dockerfile.tester .
34-
docker-build -v "tester-glibc" $BASE_NAME -f node/Dockerfile.tester-glibc .
34+
#docker-build -v "tester-glibc" $BASE_NAME -f node/Dockerfile.tester-glibc .
3535
# build node images with ruby
3636
# docker-build -v "ruby" $BASE_NAME -f node-ruby/Dockerfile .
3737
# build node images with ssh embedded
@@ -45,7 +45,7 @@ docker-build -v "chrome-tester" $BASE_NAME -f node-chrome/Dockerfile.tester .
4545
docker-build -v "vips" $BASE_NAME -f node-vips/Dockerfile .
4646
docker-build -v "vips-onbuild" $BASE_NAME -f node-vips/Dockerfile.onbuild .
4747
docker-build -v "vips-tester" $BASE_NAME -f node-vips/Dockerfile.tester .
48-
docker-build -v "vips-tester-glibc" $BASE_NAME -f node-vips/Dockerfile.tester-glibc .
48+
#docker-build -v "vips-tester-glibc" $BASE_NAME -f node-vips/Dockerfile.tester-glibc .
4949
docker-build -v "vips-tester-chrome" $BASE_NAME -f node-vips/Dockerfile.tester-chrome .
5050
# build node images with libvips & ssh
5151
docker-build -v "vips-ssh" $BASE_NAME -f node-vips-ssh/Dockerfile .

node-vips/Dockerfile.tester-docker

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ RUN \
2222
gcc \
2323
libc-dev \
2424
curl \
25-
&& curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-19.03.8.tgz | tar --strip-components=1 -xvzf - -C /bin docker/docker \
26-
&& pip install docker-compose \
25+
&& curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-20.10.6.tgz | tar --strip-components=1 -xvzf - -C /bin docker/docker \
2726
&& rm -rf \
2827
/etc/apk/cache/* \
2928
/var/cache/apk/*

node-vips/Dockerfile.tester-glibc

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

node/Dockerfile.tester-glibc

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

0 commit comments

Comments
 (0)