Skip to content

Commit 4f0329a

Browse files
committed
Consolidating image configs into one Containerfile with many targets
1 parent 0af6cec commit 4f0329a

File tree

18 files changed

+517
-663
lines changed

18 files changed

+517
-663
lines changed
Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,23 @@
77
*.iml
88

99
# Ignore Node Modules used locally
10-
public/node_modules
11-
server/node_modules
10+
node_modules
11+
node_modules
1212

1313
# Ignore Compiled Vue App
14-
release
14+
/anms-ui/release
1515

1616
# Ignore Data Directory
17-
logs
18-
17+
/anms-ui/logs
1918

2019
# Ignore Other Specific Stuff
2120
docker-compose.yaml
21+
Containerfile
2222
Dockerfile
2323
Makefile
2424
.dockerignore
2525
gl-sast-report.json
2626
.metrics-dashboard.yml
27-
CONTRIBUTING.md
27+
*.md
28+
*.pdf
29+
*.docx

.github/workflows/build-test.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ jobs:
4444
run: |
4545
./create_volume.sh ./puppet/modules/apl_test/files/anms/tls
4646
sudo mkdir /run/anms
47+
- name: Pull
48+
run: podman compose ${ANMS_COMPOSE_OPTS} pull --ignore-buildable
4749
- name: Start
4850
run: |
4951
podman compose ${TESTENV_COMPOSE_OPTS} up -d --force-recreate
@@ -108,6 +110,8 @@ jobs:
108110
run: |
109111
./create_volume.sh ./puppet/modules/apl_test/files/anms/tls
110112
sudo mkdir /run/anms
113+
- name: Pull
114+
run: podman compose ${ANMS_COMPOSE_OPTS} pull --ignore-buildable
111115
- name: Start
112116
run: |
113117
docker compose ${TESTENV_COMPOSE_OPTS} up -d --force-recreate

.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
.DS_Store
88
.project
99
.cproject
10+
.pydevproject
11+
.settings
1012

1113
# Python intermediates
1214
__pycache__
@@ -16,11 +18,9 @@ coverage.xml
1618
testresults.xml
1719

1820
# local build files
19-
anms-core/build/
20-
anms-ui/release/
21+
/anms-core/build/
22+
/anms-ui/release/
2123

2224
# Javascript and ESLint related content to be ignored
2325
node_modules
2426
package-lock.json
25-
26-
ion/configs/**/logs

0 commit comments

Comments
 (0)