Skip to content

Commit

Permalink
Revert "add oracle cloud cli to image (#182)" (#195)
Browse files Browse the repository at this point in the history
This reverts commit ddce061.

Installing the Oracle CLI the way we're installing it is causing
`/root/.bashrc` to be modified to include `/usr/bin` (the location
where the `oci` binary is placed) at the front of `PATH`,
_before_ `/usr/local/bin`.

This ends up breaking `python3 -m venv venv` called from Pulumi
Deployments because it ends up using the system Python at
`/usr/bin/python3` rather than the version of Python from this image
that should be used at `/usr/local/bin/python3` (due to the
`PATH` change in `.bashrc`), and the system Python does not have `venv`
available.

It may be possible to address this by installing the Oracle CLI binary
in `/usr/local/bin` rather than `/usr/bin`, but I'd like to see if it's
possible to install the Oracle CLI without updating `.bashrc` at all,
so reverting this in the meantime.
  • Loading branch information
justinvp committed May 24, 2024
1 parent ddce061 commit 89a3c3d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# CHANGELOG

## 3.117.0

- Revert adding Oracle Cloud Infrastructure CLI (oci-cli)
([#195](https://github.com/pulumi/pulumi-docker-containers/pull/195))

## 3.116.0

- Add Oracle Cloud Infrastructure CLI (oci-cli)
Expand Down
3 changes: 0 additions & 3 deletions docker/pulumi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,6 @@ RUN apt-get update -y && \
# Clean up the lists work
rm -rf /var/lib/apt/lists/*

# Install Oracle Cloud Infrastructure CLI
RUN bash -c "$(curl -L https://raw.githubusercontent.com/oracle/oci-cli/master/scripts/install/install.sh)" -- --exec-dir /usr/bin --accept-all-defaults

# Install Go
RUN curl -fsSLo /tmp/go.tgz https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz && \
echo "${GOLANG_SHA256} /tmp/go.tgz" | sha256sum -c - && \
Expand Down

0 comments on commit 89a3c3d

Please sign in to comment.