Skip to content

Commit 703a5b0

Browse files
committed
fix: Remove az and aws cli s from Containerfile
Cli are not needed anymore, having them increase the images size and requires extra care to keep version up to date. Fix #687 Signed-off-by: Adrian Riobo <ariobolo@redhat.com>
1 parent ccad978 commit 703a5b0

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

oci/Containerfile

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ COPY --from=builder /workspace/out/mapt /workspace/pulumi/pulumi /usr/local/bin/
2828
ENV PULUMI_CONFIG_PASSPHRASE "passphrase"
2929

3030
ENV AWS_SDK_LOAD_CONFIG=1 \
31-
AWS_CLI_VERSION=2.16.7 \
32-
AZ_CLI_VERSION=2.61.0 \
3331
ARCH_N=x86_64
3432

3533
# Pulumi plugins
@@ -52,19 +50,6 @@ ENV PULUMI_HOME "/opt/mapt/run"
5250
WORKDIR ${PULUMI_HOME}
5351

5452
RUN mkdir -p /opt/mapt/run \
55-
&& if [ "$TARGETARCH" = "arm64" ]; then export ARCH_N=aarch64; fi \
56-
&& export AWS_CLI_URL="https://awscli.amazonaws.com/awscli-exe-linux-${ARCH_N}-${AWS_CLI_VERSION}.zip" \
57-
&& export AZ_CLI_RPM="https://packages.microsoft.com/rhel/9.0/prod/Packages/a/azure-cli-${AZ_CLI_VERSION}-1.el9.${ARCH_N}.rpm" \
58-
&& echo ${AWS_CLI_URL} ${AZ_CLI_RPM} \
59-
&& curl ${AWS_CLI_URL} -o awscliv2.zip \
60-
&& dnf install -y unzip \
61-
&& unzip -qq awscliv2.zip \
62-
&& ./aws/install \
63-
&& curl -L ${AZ_CLI_RPM} -o azure-cli.rpm \
64-
&& dnf install -y azure-cli.rpm \
65-
&& rm -rf aws awscliv2.zip azure-cli.rpm \
66-
&& dnf clean all \
67-
&& rm -rf /var/cache/yum \
6853
&& pulumi plugin install resource aws ${PULUMI_AWS_VERSION} \
6954
&& pulumi plugin install resource azure-native ${PULUMI_AZURE_NATIVE_VERSION} \
7055
&& pulumi plugin install resource command ${PULUMI_COMMAND_VERSION} \
@@ -73,7 +58,7 @@ RUN mkdir -p /opt/mapt/run \
7358
&& pulumi plugin install resource awsx ${PULUMI_AWSX_VERSION} \
7459
&& pulumi plugin install resource aws-native ${PULUMI_AWS_NATIVE_VERSION} \
7560
&& chown -R 1001:0 /opt/mapt/run \
76-
&& chmod -R g=u /opt/mapt/run
61+
&& chmod -R ug+rwx /opt/mapt/run
7762

7863
USER 1001
7964
ENTRYPOINT ["mapt"]

0 commit comments

Comments
 (0)