Skip to content
This repository was archived by the owner on Feb 13, 2024. It is now read-only.

Pin platform for Mac M1/M2 support #495

Merged
merged 2 commits into from
Apr 26, 2023
Merged

Pin platform for Mac M1/M2 support #495

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99091e3
Pin platform for Mac M1/M2 support
ublock Apr 25, 2023
7f781c1
Merge branch 'dev' into ublock-patch-1
ublock Apr 26, 2023
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
11 changes: 6 additions & 5 deletions config/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
##################################################################################################################################################
# STARTING WITH ALL THE SAP TOOLS FIRST
##################################################################################################################################################
FROM alpine:3 AS base
FROM --platform=linux/amd64 alpine:3 AS base
ENV ARCH=linux-amd64
ENV TOOLS_URL=tools.hana.ondemand.com
ENV CPCLI_URL=cpcli.cf.eu10.hana.ondemand.com
Expand All @@ -20,7 +20,7 @@ RUN echo "http://dl-4.alpinelinux.org/alpine/latest-stable/community" >> /etc/ap
##########################################################################################
# Retrieve the CloudFoundry CLI
##########################################################################################
FROM cloudfoundry/cli:8.6.1 as cf_cli
FROM --platform=linux/amd64 cloudfoundry/cli:8.6.1 as cf_cli

##########################################################################################
## Retrieve the SAP btp CLI
Expand Down Expand Up @@ -84,7 +84,7 @@ RUN curl -fsSL --url "https://git.sr.ht/~gpanders/ijq/refs/download/v${VER_IJQ}/
########################################################################################
# Bring the tools together into the final base stage
########################################################################################
FROM alpine:3 as tools
FROM --platform=linux/amd64 alpine:3 as tools
WORKDIR /usr/local/bin
COPY --from=cf_cli /usr/local/bin/cf8 .
COPY --from=btp_cli /tmp/tools/ .
Expand All @@ -97,7 +97,7 @@ ARG BTPSA_VERSION_GIT_ARG=default
##################################################################################################################################################
# Now putting all pieces together
##################################################################################################################################################
FROM python:3.10-alpine3.16 AS final_build
FROM --platform=linux/amd64 python:3.10-alpine3.16 AS final_build
ENV USERNAME=user
ENV HOME_FOLDER /home/$USERNAME
ENV LIBS_FOLDER $HOME_FOLDER/libs
Expand Down Expand Up @@ -132,6 +132,7 @@ RUN adduser \
nodejs \
npm \
sudo \
libc6-compat \
&& pip install --no-cache-dir -r /tmp/pip-tmp/requirements.txt \
&& rm -rf /tmp/pip-tmp \
## Set the right timezone in the container image
Expand Down Expand Up @@ -166,7 +167,7 @@ COPY --chown=root:root --from=tools /usr/local/bin/fx /usr/local/bin
COPY --chown=root:root --from=tools /usr/local/bin/ijq /usr/local/bin

## Install the CF plugin for deploying MTAs on Cloudfoundry
RUN cf install-plugin -f https://github.com/cloudfoundry-incubator/multiapps-cli-plugin/releases/latest/download/multiapps-plugin.linux32
RUN cf install-plugin -f https://github.com/cloudfoundry-incubator/multiapps-cli-plugin/releases/latest/download/multiapps-plugin.linux64

## Install krew and the oidc-login plugin
RUN OS="$(uname | tr '[:upper:]' '[:lower:]')" \
Expand Down