Skip to content

Commit e7c1eaa

Browse files
committed
stock mixing upper and lower case characters in docker stages
1 parent f9a8609 commit e7c1eaa

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@
4848

4949
"build": {
5050
"cacheFrom": "donalffons/opencascade.js:staging-master",
51-
"target": "customBuildImage"
51+
"target": "custom-build-image"
5252
}
5353
}

.github/workflows/buildFull.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,21 @@ jobs:
6464
npm install
6565
cd ..
6666
67-
- name: Build OpenCascade.js Docker Image "testImage" and run binding tests
67+
- name: Build OpenCascade.js Docker Image "test-image" and run binding tests
6868
timeout-minutes: 10000
6969
run: |
7070
docker pull ${{ secrets.DOCKER_IMAGE_NAME }}:latest || true
7171
docker pull ${{ secrets.DOCKER_IMAGE_NAME }}:staging-${{ steps.dockerStagingTag.outputs.tag }} || true
72-
docker build --target testImage --build-arg threading=single-threaded -t ${{ secrets.DOCKER_IMAGE_NAME }}-test-image --cache-from ${{ secrets.DOCKER_IMAGE_NAME }}:staging-${{ steps.dockerStagingTag.outputs.tag }} --cache-from ${{ secrets.DOCKER_IMAGE_NAME }}:latest .
72+
docker build --target test-image --build-arg threading=single-threaded -t ${{ secrets.DOCKER_IMAGE_NAME }}-test-image --cache-from ${{ secrets.DOCKER_IMAGE_NAME }}:staging-${{ steps.dockerStagingTag.outputs.tag }} --cache-from ${{ secrets.DOCKER_IMAGE_NAME }}:latest .
7373
cd test
7474
dockerImageName="${{ secrets.DOCKER_IMAGE_NAME }}-test-image" npm run test -- ./testBindings.test.ts
7575
cd ..
7676
77-
- name: Build OpenCascade.js Docker Image "customBuildImage"
77+
- name: Build OpenCascade.js Docker Image "custom-build-image"
7878
if: github.event.inputs.buildType != 'testBindings'
7979
timeout-minutes: 10000
8080
run: |
81-
docker build --target customBuildImage --build-arg threading=single-threaded -t ${{ secrets.DOCKER_IMAGE_NAME }} --cache-from ${{ secrets.DOCKER_IMAGE_NAME }}:staging-${{ steps.dockerStagingTag.outputs.tag }} --cache-from ${{ secrets.DOCKER_IMAGE_NAME }}:latest .
81+
docker build --target custom-build-image --build-arg threading=single-threaded -t ${{ secrets.DOCKER_IMAGE_NAME }} --cache-from ${{ secrets.DOCKER_IMAGE_NAME }}:staging-${{ steps.dockerStagingTag.outputs.tag }} --cache-from ${{ secrets.DOCKER_IMAGE_NAME }}:latest .
8282
8383
- name: Push to Docker Hub (staging)
8484
if: github.event.inputs.buildType != 'testBindings'
@@ -109,7 +109,7 @@ jobs:
109109
run: |
110110
docker pull ${{ secrets.DOCKER_IMAGE_NAME }}:multi-threaded || true
111111
docker pull ${{ secrets.DOCKER_IMAGE_NAME }}:staging-${{ steps.dockerStagingTag.outputs.tag }}-multi-threaded || true
112-
docker build --target customBuildImage --build-arg threading=multi-threaded -t ${{ secrets.DOCKER_IMAGE_NAME }}:multi-threaded --cache-from ${{ secrets.DOCKER_IMAGE_NAME }}:staging-${{ steps.dockerStagingTag.outputs.tag }}-multi-threaded --cache-from ${{ secrets.DOCKER_IMAGE_NAME }}:multi-threaded .
112+
docker build --target custom-build-image --build-arg threading=multi-threaded -t ${{ secrets.DOCKER_IMAGE_NAME }}:multi-threaded --cache-from ${{ secrets.DOCKER_IMAGE_NAME }}:staging-${{ steps.dockerStagingTag.outputs.tag }}-multi-threaded --cache-from ${{ secrets.DOCKER_IMAGE_NAME }}:multi-threaded .
113113
114114
- name: Push to Docker Hub (Staging, Multi-Threaded)
115115
if: github.event.inputs.buildType != 'testBindings' && github.event.inputs.multithreaded == 'true'

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM emscripten/emsdk:3.1.14 AS baseImage
1+
FROM emscripten/emsdk:3.1.14 AS base-image
22

33
RUN \
44
apt update -y && \
@@ -54,7 +54,7 @@ WORKDIR /src/
5454
ARG threading=single-threaded
5555
ENV threading=$threading
5656

57-
FROM baseImage AS testImage
57+
FROM base-image AS test-image
5858

5959
RUN \
6060
mkdir /opencascade.js/build/ && \
@@ -63,7 +63,7 @@ RUN \
6363

6464
ENTRYPOINT ["/opencascade.js/src/buildFromYaml.py"]
6565

66-
FROM testImage AS customBuildImage
66+
FROM test-image AS custom-build-image
6767

6868
RUN \
6969
/opencascade.js/src/generateBindings.py && \

0 commit comments

Comments
 (0)