Skip to content

Commit cc25e81

Browse files
Combine containerfiles to avoid intermediate images (#233)
* Consolidating image configs into one Containerfile with many targets * Separate Containerfile contents to segregate ION --------- Co-authored-by: David Edell <david.edell@jhuapl.edu>
1 parent d0987e5 commit cc25e81

File tree

19 files changed

+446
-547
lines changed

19 files changed

+446
-547
lines changed

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
# Ignore build files
1010
node_modules
11-
/puppet/.modules
11+
/puppet/.modules/
1212
# Ignore Compiled Vue App
1313
/anms-ui/release
1414
# Ignore Data Directory

.github/workflows/build-test.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ jobs:
4343
DOCKER_IMAGE_TAG=$(echo ${{ github.head_ref || github.ref_name }} | sed 's/[^a-zA-Z0-9\-\._]/-/g')
4444
echo "DOCKER_IMAGE_TAG=${DOCKER_IMAGE_TAG}" >> $GITHUB_ENV
4545
- name: Build ANMS
46-
run: |
47-
${DOCKER_CMD} compose ${ANMS_COMPOSE_OPTS} build builder-base builder-acelib
48-
${DOCKER_CMD} compose ${ANMS_COMPOSE_OPTS} build
46+
run: ${DOCKER_CMD} compose ${ANMS_COMPOSE_OPTS} build
4947
- name: Build Agents
5048
run: ${DOCKER_CMD} compose ${TESTENV_COMPOSE_OPTS} build
5149
- name: Build Volume

.gitignore

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@ coverage.xml
1818
testresults.xml
1919

2020
# local build files
21-
anms-core/build/
22-
anms-ui/release/
21+
/anms-core/build/
22+
/anms-ui/release/
2323

2424
# Javascript and ESLint related content to be ignored
2525
node_modules
2626
package-lock.json
27-
28-
ion/configs/**/logs

anms-core/.dockerignore

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

anms-core/Dockerfile

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

anms-ui/.dockerignore

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

anms-ui/Dockerfile

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

0 commit comments

Comments
 (0)