Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Docker/Dockerfile-ORE
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# syntax = docker/dockerfile:1.2
ARG DOCKER_REPO
ARG DEBIAN_TAG
ARG ORE_BUILD_VERSION
FROM ${DOCKER_REPO}ore-build-dependencies:${ORE_BUILD_VERSION} as orebuild
FROM ${DOCKER_REPO}ore-build-dependencies:${ORE_BUILD_VERSION} AS orebuild

LABEL Quaternion Risk Management
LABEL Description="Build ORE"
Expand Down
3 changes: 2 additions & 1 deletion Docker/Dockerfile-ORE-App
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#ARG TEST_TAG=latest
ARG CMAKE_BUILD_TYPE=Release
ARG DOCKER_REPO
ARG ORE_HELPER_VERSION
ARG ORE_VERSION

FROM ${DOCKER_REPO}env_ore:${ORE_VERSION} as env_ore
FROM ${DOCKER_REPO}env_ore:${ORE_VERSION} AS env_ore
FROM ${DOCKER_REPO}ore-helper:${ORE_HELPER_VERSION}

RUN mkdir -p /ore/App
Expand Down
3 changes: 2 additions & 1 deletion Docker/Dockerfile-ORE-Dependencies
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# syntax = docker/dockerfile:1.2
ARG DOCKER_REPO
ARG DEBIAN_TAG
FROM ${DOCKER_TAG}debian:${DEBIAN_TAG}
FROM ${DOCKER_REPO}debian:${DEBIAN_TAG}

RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive \
Expand Down
1 change: 1 addition & 0 deletions Docker/docker-compose-ore-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ services:
context: ../
dockerfile: Docker/Dockerfile-ORE-App
args:
- DEBIAN_TAG=${DEBIAN_TAG}
- ORE_VERSION=${ORE_TAG}
- ORE_HELPER_VERSION=${ORE_HELPER_VERSION}