Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

399-dockerhub-rate-limit - update habuhsu generated code to include registry in image names #401

Merged
merged 1 commit into from
Oct 8, 2024
Merged
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
2 changes: 1 addition & 1 deletion build-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<version.failsafe.plugin>${version.maven.surefire.plugin}</version.failsafe.plugin>
<version.fermenter>2.10.3</version.fermenter>
<version.fermenter.legacy.tools>2.8.0</version.fermenter.legacy.tools>
<version.habushu.plugin>2.16.1</version.habushu.plugin>
<version.habushu.plugin>2.17.0</version.habushu.plugin>
<version.python>3.11.4</version.python>
<version.help.plugin>3.5.0</version.help.plugin>
<version.krausening>20</version.krausening>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#HABUSHU_BUILDER_STAGE - HABUSHU GENERATED CODE (DO NOT MODIFY)
FROM python:3.11 AS habushu_builder
FROM docker.io/python:3.11 AS habushu_builder
# Poetry and supporting plugin installations
RUN python -m ensurepip --upgrade && \
pip install poetry && \
poetry self add poetry-monorepo-dependency-plugin && \
poetry self add poetry-plugin-bundle
poetry self add poetry-plugin-bundle@1.3.0

WORKDIR /work-dir
COPY --chown=1001 target/containerize-support ./containerize-support/
Expand All @@ -21,7 +21,7 @@ RUN --mount=type=cache,target=/.cache/pypoetry/ \
#HABUSHU_BUILDER_STAGE - HABUSHU GENERATED CODE (END)

#HABUSHU_FINAL_STAGE - HABUSHU GENERATED CODE (DO NOT MODIFY)
FROM python:3.11-slim AS final
FROM docker.io/python:3.11-slim AS final
# Copy venv from builder and activate by adding to the path
COPY --from=habushu_builder --chown=1001 /opt/venv /opt/venv/
ENV PATH="/opt/venv/bin:$PATH"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#HABUSHU_BUILDER_STAGE - HABUSHU GENERATED CODE (DO NOT MODIFY)
FROM python:3.11 AS habushu_builder
FROM docker.io/python:3.11 AS habushu_builder
# Poetry and supporting plugin installations
RUN python -m ensurepip --upgrade && \
pip install poetry && \
poetry self add poetry-monorepo-dependency-plugin && \
poetry self add poetry-plugin-bundle
poetry self add poetry-plugin-bundle@1.3.0

WORKDIR /work-dir
COPY --chown=1001 target/containerize-support ./containerize-support/
Expand All @@ -21,7 +21,7 @@ RUN --mount=type=cache,target=/.cache/pypoetry/ \
#HABUSHU_BUILDER_STAGE - HABUSHU GENERATED CODE (END)

#HABUSHU_FINAL_STAGE - HABUSHU GENERATED CODE (DO NOT MODIFY)
FROM python:3.11-slim AS final
FROM docker.io/python:3.11-slim AS final
# Copy venv from builder and activate by adding to the path
COPY --from=habushu_builder --chown=1001 /opt/venv /opt/venv/
ENV PATH="/opt/venv/bin:$PATH"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#HABUSHU_BUILDER_STAGE - HABUSHU GENERATED CODE (DO NOT MODIFY)
FROM python:3.11 AS habushu_builder
FROM docker.io/python:3.11 AS habushu_builder
# Poetry and supporting plugin installations
RUN python -m ensurepip --upgrade && \
pip install poetry && \
poetry self add poetry-monorepo-dependency-plugin && \
poetry self add poetry-plugin-bundle
poetry self add poetry-plugin-bundle@1.3.0

WORKDIR /work-dir
COPY --chown=1001 target/containerize-support ./containerize-support/
Expand All @@ -31,7 +31,7 @@ RUN wget https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries
COPY ./src/main/resources/model_versioning /app/model_versioning

#HABUSHU_FINAL_STAGE - HABUSHU GENERATED CODE (DO NOT MODIFY)
FROM python:3.11-slim AS final
FROM docker.io/python:3.11-slim AS final
# Copy venv from builder and activate by adding to the path
COPY --from=habushu_builder --chown=1001 /opt/venv /opt/venv/
ENV PATH="/opt/venv/bin:$PATH"
Expand Down
4 changes: 2 additions & 2 deletions extensions/extensions-docker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@
<phase>prepare-package</phase>
<configuration>
<dockerfile>${project.basedir}/src/main/resources/docker/Dockerfile</dockerfile>
<dockerBuilderBase>python:3.11</dockerBuilderBase>
<dockerFinalBase>python:3.11-slim</dockerFinalBase>
<dockerBuilderBase>docker.io/python:3.11</dockerBuilderBase>
<dockerFinalBase>docker.io/python:3.11-slim</dockerFinalBase>
<dockerUser>1001</dockerUser>
</configuration>
</execution>
Expand Down