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

feat: add Python support #61

Closed
wants to merge 1 commit into from
Closed
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
3 changes: 0 additions & 3 deletions docker-image/Dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@ COPY --from=builder /usr/local/lib/python3.9 /usr/local/lib/python3.9
COPY --from=builder /usr/lib64/libpython3.9.so.1.0 /usr/lib64/libpython3.9.so.1.0
COPY --from=builder /usr/lib64/libexpat.so.1 /usr/lib64/libexpat.so.1

RUN ln -s /usr/bin/python3 /usr/bin/python \
&& ln -s /usr/local/bin/pip3 /usr/bin/pip

# Copy jq executable from the builder stage
COPY --from=builder /usr/bin/jq /usr/bin/jq

Expand Down
12 changes: 12 additions & 0 deletions docker-image/Dockerfiles/Dockerfile.alpha
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ RUN curl -kL https://dlcdn.apache.org/maven/maven-3/3.9.4/binaries/apache-maven-
RUN curl -kL https://go.dev/dl/go1.21.1.linux-amd64.tar.gz -o /tmp/golang-package.tar.gz \
&& tar xvzf /tmp/golang-package.tar.gz -C /usr/

# install python package manager (pip)
RUN python3 -m ensurepip --upgrade

# install jq JSON formating tool
RUN curl -kL https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 -o /usr/bin/jq

Expand All @@ -39,6 +42,7 @@ COPY scripts/rhda.sh /
RUN chmod +x /usr/jdk-20.0.2/bin/java \
&& chmod +x /usr/apache-maven-3.9.4/bin/mvn \
&& chmod +x /usr/go/bin/go \
&& chmod +x /usr/local/bin/pip3 \
&& chmod +x /usr/bin/jq \
&& chmod +x /usr/bin/uuidgen \
&& chmod +x /opt/app-root/src/.npm-global/bin/exhort-javascript-api \
Expand Down Expand Up @@ -74,6 +78,14 @@ ENV GOLANG_HOME=/usr/go
# Update PATH
ENV PATH=$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin:$GOLANG_HOME/bin

# Copy python executable from the builder stage
COPY --from=builder /usr/bin/python3 /usr/bin/python3
COPY --from=builder /usr/local/bin/pip3 /usr/local/bin/pip3
COPY --from=builder /usr/lib64/python3.9 /usr/lib64/python3.9
COPY --from=builder /usr/local/lib/python3.9 /usr/local/lib/python3.9
COPY --from=builder /usr/lib64/libpython3.9.so.1.0 /usr/lib64/libpython3.9.so.1.0
COPY --from=builder /usr/lib64/libexpat.so.1 /usr/lib64/libexpat.so.1

# Copy jq executable from the builder stage
COPY --from=builder /usr/bin/jq /usr/bin/jq

Expand Down
8 changes: 4 additions & 4 deletions docker-image/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Both Docker and Podman are container runtimes that can be used to build and run

## Images generated for Exhort Javascript API

Ecosystem | Version | IMAGE | TAG |
----------------------| ------------------------------------------------------------------ | ----------------------------------------------- |-------------------|
Maven & NPM | mvn 3.9.4, <br>npm 9.5.0 | quay.io/ecosystem-appeng/exhort-javascript-api | 0.7.0-alpha |
Maven, NPM & Golang | mvn 3.9.4, <br>npm 9.5.0, <br>go 1.21.1 | quay.io/ecosystem-appeng/exhort-javascript-api | 0.7.3-alpha |
Ecosystem | Version | IMAGE | TAG |
------------------------------| ------------------------------------------------------------------ | ----------------------------------------------- |-------------------|
Maven & NPM | mvn 3.9.4, <br>npm 9.5.0 | quay.io/ecosystem-appeng/exhort-javascript-api | 0.7.0-alpha |
Maven, NPM, Golang & Python | mvn 3.9.4, <br>npm 9.5.0, <br>go 1.21.1, <br>python3 3.9.16, <br>pip3 21.2.3 | quay.io/ecosystem-appeng/exhort-javascript-api | 0.7.3-alpha |
Loading