Skip to content
This repository has been archived by the owner on Aug 26, 2024. It is now read-only.

Add Power and Z Support to the creator-ee image #401

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
2 changes: 1 addition & 1 deletion Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ COPY _build/devtools-publish /usr/local/bin/devtools-publish
COPY _build/shells /etc/shells
COPY _build/.bashrc /home/runner/.bashrc
RUN \
microdnf install --assumeyes ncurses && \
microdnf install --assumeyes ncurses rustc cargo openssl openssl-devel && \
microdnf clean all && \
pip3 install --progress-bar=off \
-r requirements.txt && \
Expand Down
4 changes: 2 additions & 2 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ tasks:
- podman container prune -f
- podman manifest exists {{.CNT_NAME_TAG}} && podman manifest rm {{.CNT_NAME_TAG}} || true
- podman image exists {{.CNT_NAME_TAG}} && podman image rm -f {{.CNT_NAME_TAG}} || true
- podman buildx build ${EXTRA_OPTS:---platform=linux/amd64,linux/arm64} --load {{.CNT_ROOT}} --manifest localhost/{{.CNT_NAME_TAG}}
- podman buildx build ${EXTRA_OPTS:---platform=linux/amd64,linux/arm64,linux/ppc64le,linux/s390x} --load {{.CNT_ROOT}} --manifest localhost/{{.CNT_NAME_TAG}}
# running manifest exists is mandatory as this fails if no manifest is
# created locally. If this is skipped the inspect might pull the last
# published manifest instead of using the local one.
Expand Down Expand Up @@ -93,7 +93,7 @@ tasks:
- podman container prune -f
- podman manifest exists {{.CNT_NAME_TAG}} && podman manifest rm {{.CNT_NAME_TAG}} || true
- podman image exists {{.CNT_NAME_TAG}} && podman image rm -f {{.CNT_NAME_TAG}} || true
- podman buildx build ${EXTRA_OPTS:---platform=linux/amd64,linux/arm64} --build-arg=CONTAINER_NAME={{.CNT_NAME_TAG}} --load {{.CNT_ROOT}} --manifest {{.CNT_NAME_TAG}}
- podman buildx build ${EXTRA_OPTS:---platform=linux/amd64,linux/arm64,linux/ppc64le,linux/s390x} --build-arg=CONTAINER_NAME={{.CNT_NAME_TAG}} --load {{.CNT_ROOT}} --manifest {{.CNT_NAME_TAG}}
# running manifest exists is mandatory as this fails if no manifest is
# created locally. If this is skipped the inspect might pull the last
# published manifest instead of using the local one.
Expand Down
2 changes: 2 additions & 0 deletions _build/test-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ fi
# verify podman ability to execute multi-arch commands:
podman run --arch=arm64 -qit bash arch
podman run --arch=amd64 -qit bash arch
podman run --arch=ppc64le -qit bash arch
podman run --arch=s390x -qit bash arch

# Create a build manifest so we can compare between builds and machines, this
# also has the role of ensuring that the required executables are present.
Expand Down