Skip to content

Commit 30045de

Browse files
committed
Fixing container build after merge
1 parent 1d5a58e commit 30045de

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

agent-compose.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ services:
3838
container_name: ${DOCKER_CTR_PREFIX}ion-manager
3939
hostname: ion-manager
4040
image: ${DOCKER_IMAGE_PREFIX}ion-manager:${DOCKER_IMAGE_TAG}
41+
build:
42+
context: deps
43+
dockerfile: reftools.Dockerfile
44+
target: ion-manager
4145
restart: unless-stopped
4246
volumes:
4347
- "/var/run/anms:/var/tmp/anms"
@@ -65,6 +69,10 @@ services:
6569
ion-agent2: &ion-agent
6670
hostname: ion-agent2
6771
image: ${DOCKER_IMAGE_PREFIX}ion-agent:${DOCKER_IMAGE_TAG}
72+
build:
73+
context: deps
74+
dockerfile: reftools.Dockerfile
75+
target: ion-agent
6876
build:
6977
context: ion
7078
dockerfile: Dockerfile

deps/reftools.Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
## limitations under the License.
1717
##
1818

19-
FROM anms-init AS deps-base
19+
FROM localhost/anms-init AS deps-base
2020
RUN --mount=type=cache,target=/var/cache/yum \
2121
dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
2222
RUN --mount=type=cache,target=/var/cache/yum \
@@ -95,7 +95,6 @@ COPY dtnma-tools/cmake /usr/local/src/dtnma-tools/cmake
9595
COPY dtnma-tools/src /usr/local/src/dtnma-tools/src
9696
COPY dtnma-tools/test /usr/local/src/dtnma-tools/test
9797
COPY dtnma-tools/CMakeLists.txt /usr/local/src/dtnma-tools/
98-
RUN ls -lt /usr/local/src/dtnma-tools/
9998
RUN cd /usr/local/src/dtnma-tools && \
10099
cmake -S . -B build/default \
101100
-DCMAKE_BUILD_TYPE=Debug \
@@ -122,7 +121,6 @@ COPY dtnma-tools/cmake /usr/local/src/dtnma-tools/cmake
122121
COPY dtnma-tools/src /usr/local/src/dtnma-tools/src
123122
COPY dtnma-tools/test /usr/local/src/dtnma-tools/test
124123
COPY dtnma-tools/CMakeLists.txt /usr/local/src/dtnma-tools/
125-
RUN ls -lt /usr/local/src/dtnma-tools/
126124
RUN cd /usr/local/src/dtnma-tools && \
127125
cmake -S . -B build/default \
128126
-DCMAKE_BUILD_TYPE=Debug \
@@ -150,7 +148,6 @@ COPY dtnma-tools/cmake /usr/local/src/dtnma-tools/cmake
150148
COPY dtnma-tools/src /usr/local/src/dtnma-tools/src
151149
COPY dtnma-tools/test /usr/local/src/dtnma-tools/test
152150
COPY dtnma-tools/CMakeLists.txt /usr/local/src/dtnma-tools/
153-
RUN ls -lt /usr/local/src/dtnma-tools/
154151
RUN cd /usr/local/src/dtnma-tools && \
155152
cmake -S . -B build/default \
156153
-DCMAKE_BUILD_TYPE=Debug \

0 commit comments

Comments
 (0)