Skip to content

Commit a4d2843

Browse files
committed
Update Dockerfile to use debian:bookworm-slim and streamline label formatting
1 parent 1b92960 commit a4d2843

File tree

1 file changed

+16
-19
lines changed

1 file changed

+16
-19
lines changed

janusgraph-dist/docker/Dockerfile

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
ARG BASE_IMAGE=eclipse-temurin:11-jre
1616

17-
FROM debian:bullseye-slim as builder
17+
FROM debian:bookworm-slim as builder
1818

1919
ARG TARGETARCH
2020
ARG JANUS_VERSION=1.0.0-SNAPSHOT
@@ -65,14 +65,11 @@ RUN groupadd -r janusgraph --gid=999 && \
6565
rm -rf /var/lib/apt/lists/*
6666

6767
COPY --from=builder --chown=999:999 /opt/janusgraph/ /opt/janusgraph/
68-
COPY --from=builder /opt/yq /usr/bin/yq
69-
COPY docker/docker-entrypoint.sh /usr/local/bin/
70-
COPY docker/load-initdb.sh /usr/local/bin/
71-
72-
RUN chmod 755 /usr/local/bin/docker-entrypoint.sh && \
73-
chmod 755 /usr/local/bin/load-initdb.sh && \
74-
chmod 755 /usr/bin/yq && \
75-
mkdir -p ${JANUS_INITDB_DIR} ${JANUS_CONFIG_DIR} ${JANUS_DATA_DIR} && \
68+
COPY --from=builder --chmod=755 /opt/yq /usr/bin/yq
69+
COPY --chmod=755 docker/docker-entrypoint.sh /usr/local/bin/
70+
COPY --chmod=755 docker/load-initdb.sh /usr/local/bin/
71+
72+
RUN mkdir -p ${JANUS_INITDB_DIR} ${JANUS_CONFIG_DIR} ${JANUS_DATA_DIR} && \
7673
chown -R janusgraph:janusgraph ${JANUS_INITDB_DIR} ${JANUS_CONFIG_DIR} ${JANUS_DATA_DIR}
7774

7875
EXPOSE 8182
@@ -86,13 +83,13 @@ CMD [ "janusgraph" ]
8683
ARG CREATED=test
8784
ARG REVISION=test
8885

89-
LABEL org.opencontainers.image.title="JanusGraph Docker Image"
90-
LABEL org.opencontainers.image.description="Official JanusGraph Docker image"
91-
LABEL org.opencontainers.image.url="https://janusgraph.org/"
92-
LABEL org.opencontainers.image.documentation="https://docs.janusgraph.org/v1.1/"
93-
LABEL org.opencontainers.image.revision="${REVISION}"
94-
LABEL org.opencontainers.image.source="https://github.com/JanusGraph/janusgraph-docker/"
95-
LABEL org.opencontainers.image.vendor="JanusGraph"
96-
LABEL org.opencontainers.image.version="${JANUS_VERSION}"
97-
LABEL org.opencontainers.image.created="${CREATED}"
98-
LABEL org.opencontainers.image.license="Apache-2.0"
86+
LABEL org.opencontainers.image.title="JanusGraph Docker Image" \
87+
org.opencontainers.image.description="Official JanusGraph Docker image" \
88+
org.opencontainers.image.url="https://janusgraph.org/" \
89+
org.opencontainers.image.documentation="https://docs.janusgraph.org/v1.1/" \
90+
org.opencontainers.image.revision="${REVISION}" \
91+
org.opencontainers.image.source="https://github.com/JanusGraph/janusgraph-docker/" \
92+
org.opencontainers.image.vendor="JanusGraph" \
93+
org.opencontainers.image.version="${JANUS_VERSION}" \
94+
org.opencontainers.image.created="${CREATED}" \
95+
org.opencontainers.image.license="Apache-2.0"

0 commit comments

Comments
 (0)