Skip to content

Commit

Permalink
Merge pull request #48 from pacostas/adding-python3
Browse files Browse the repository at this point in the history
Adding python3 on the build image.
  • Loading branch information
TisVictress authored Dec 6, 2023
2 parents ac14c46 + 10a78a1 commit 81e428e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/paketo-buildpacks/packit/v2/scribe"
)

var PACKAGES = "make gcc gcc-c++ libatomic_ops git openssl-devel nodejs npm nodejs-nodemon nss_wrapper which"
var PACKAGES = "make gcc gcc-c++ libatomic_ops git openssl-devel nodejs npm nodejs-nodemon nss_wrapper which python3"

var DEFAULT_USER_ID = 1002
var DEFAULT_GROUP_ID = 1000
Expand Down Expand Up @@ -84,7 +84,7 @@ func Generate(dependencyManager DependencyManager, logger scribe.Emitter, during
CNB_USER_ID: duringBuildPermissions.CNB_USER_ID,
CNB_GROUP_ID: duringBuildPermissions.CNB_GROUP_ID,
CNB_STACK_ID: CNB_STACK_ID,
PACKAGES: "make gcc gcc-c++ libatomic_ops git openssl-devel nodejs npm nodejs-nodemon nss_wrapper which",
PACKAGES: PACKAGES,
}, buildDockerfileTemplate)

if err != nil {
Expand Down
8 changes: 4 additions & 4 deletions generate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ func testFillPropsToTemplate(t *testing.T, context spec.G, it spec.S) {
CNB_USER_ID: 1000,
CNB_GROUP_ID: 1000,
CNB_STACK_ID: "",
PACKAGES: "make gcc gcc-c++ libatomic_ops git openssl-devel nodejs npm nodejs-nodemon nss_wrapper which",
PACKAGES: ubinodejsextension.PACKAGES,
}, buildDockerfileTemplate)

Expect(err).NotTo(HaveOccurred())
Expect(output).To(Equal(`ARG base_image
Expect(output).To(Equal(fmt.Sprintf(`ARG base_image
FROM ${base_image}
USER root
Expand All @@ -66,12 +66,12 @@ ARG build_id=0
RUN echo ${build_id}
RUN microdnf -y module enable nodejs:16
RUN microdnf --setopt=install_weak_deps=0 --setopt=tsflags=nodocs install -y make gcc gcc-c++ libatomic_ops git openssl-devel nodejs npm nodejs-nodemon nss_wrapper which && microdnf clean all
RUN microdnf --setopt=install_weak_deps=0 --setopt=tsflags=nodocs install -y %s && microdnf clean all
RUN echo uid:gid "1000:1000"
USER 1000:1000
RUN echo "CNB_STACK_ID: "`))
RUN echo "CNB_STACK_ID: "`, ubinodejsextension.PACKAGES)))

})

Expand Down

0 comments on commit 81e428e

Please sign in to comment.