Skip to content

Commit

Permalink
Merge branch 'main' into msteiner.ubuntu-22.04
Browse files Browse the repository at this point in the history
  • Loading branch information
cmickeyb authored Jan 29, 2024
2 parents 6aa5186 + 8a17865 commit 0c7681d
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 3 deletions.
10 changes: 9 additions & 1 deletion docker/pdo_ccf.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
# limitations under the License.
# ------------------------------------------------------------------------------

# syntax = docker/dockerfile:experimental
# above enable build-kit extension for 'RUN --mount=type= ..' extension used below
# to cache pip downloads between builds, cutting down noticeably build time.
# Note that cache is cleaned with the "uusal" docker prune commans, e.g., docker builder prune.

ARG PDO_VERSION
FROM pdo_ccf_base:${PDO_VERSION}

Expand Down Expand Up @@ -44,7 +49,10 @@ WORKDIR /project/pdo/tools
COPY --chown=${UNAME}:${UNAME} tools/*.sh ./

# build it!!!
RUN /project/pdo/tools/build_ccf.sh
ARG UID=1000
ARG GID=${UID}
RUN --mount=type=cache,uid=${UID},gid=${GID},target=/project/pdo/.cache/pip \
/project/pdo/tools/build_ccf.sh

# Network ports for running services
EXPOSE 6600
Expand Down
10 changes: 9 additions & 1 deletion docker/pdo_client.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
# limitations under the License.
# ------------------------------------------------------------------------------

# syntax = docker/dockerfile:experimental
# above enable build-kit extension for 'RUN --mount=type= ..' extension used below
# to cache pip downloads between builds, cutting down noticeably build time.
# Note that cache is cleaned with the "uusal" docker prune commans, e.g., docker builder prune.

ARG PDO_VERSION
FROM pdo_base:${PDO_VERSION}

Expand Down Expand Up @@ -63,7 +68,10 @@ WORKDIR /project/pdo/tools
COPY --chown=${UNAME}:${UNAME} tools/*.sh ./

# build it!!!
RUN /project/pdo/tools/build_client.sh
ARG UID=1000
ARG GID=${UID}
RUN --mount=type=cache,uid=${UID},gid=${GID},target=/project/pdo/.cache/pip \
/project/pdo/tools/build_client.sh

ARG PDO_HOSTNAME
ENV PDO_HOSTNAME=$PDO_HOSTNAME
Expand Down
10 changes: 9 additions & 1 deletion docker/pdo_services.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
# limitations under the License.
# ------------------------------------------------------------------------------

# syntax = docker/dockerfile:experimental
# above enable build-kit extension for 'RUN --mount=type= ..' extension used below
# to cache pip downloads between builds, cutting down noticeably build time.
# Note that cache is cleaned with the "uusal" docker prune commans, e.g., docker builder prune.

ARG PDO_VERSION
FROM pdo_services_base:${PDO_VERSION}

Expand Down Expand Up @@ -48,7 +53,10 @@ WORKDIR /project/pdo/tools
COPY --chown=${UNAME}:${UNAME} tools/*.sh ./

# built it!
RUN /project/pdo/tools/build_services.sh
ARG UID=1000
ARG GID=${UID}
RUN --mount=type=cache,uid=${UID},gid=${GID},target=/project/pdo/.cache/pip \
/project/pdo/tools/build_services.sh

# Network ports for running services
EXPOSE 7001 7002 7003 7004 7005
Expand Down

0 comments on commit 0c7681d

Please sign in to comment.