Skip to content

Commit

Permalink
Add nvm, update readme and bake-file (#76)
Browse files Browse the repository at this point in the history
* add nvm, update readme and bake-file
- update pulumi version to 3.91.0
- set CARGO_HOME to `/usr/local/cargo`
- set RUSTUP_HOME to `/usr/local/rustup`
- remove warning from readme

* set rust profile to minimal
  • Loading branch information
mauwii authored Oct 27, 2023
1 parent dc09432 commit 96ca4bb
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
[![Docker-Hub description workflow badge][Docker-Hub-description-badge]][Workflow-DockerHubDescription]
[![Mergify badge][mergify-badge]][mergify] [![License badge][License-badge]][License]

> [!WARNING]
> Heavily under construction, so please do not use this anywhere in production
## What

The docker images in this repository are made to be used with [nektos/act][nektos-act-repo], which
Expand Down
6 changes: 3 additions & 3 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ variable "NODE_VERSION" {
}

variable "PULUMI_VERSION" {
default = "3.89.0"
default = "3.91.0"
}

variable "POWERSHELL_AZ_MODULE_VERSIONS" {
Expand Down Expand Up @@ -113,7 +113,7 @@ target "ubuntu" {
}
args = {
BICEP_VERSION = BICEP_VERSION
CARGO_HOME = "/etc/.skel/.cargo"
CARGO_HOME = "/usr/local/cargo"
CODENAME = release.codename
DEPENDENCIES = DEPENDENCIES
DOTNET_CHANNEL = release.DOTNET_CHANNEL
Expand All @@ -133,7 +133,7 @@ target "ubuntu" {
POWERSHELL_MODULES = POWERSHELL_MODULES
POWERSHELL_VERSION = release.POWERSHELL_VERSION
PULUMI_VERSION = PULUMI_VERSION
RUSTUP_HOME = "/etc/.skel/.rustup"
RUSTUP_HOME = "/usr/local/rustup"
TOOL_PATH_PWSH = "/usr/share/powershell"
}
name = "ubuntu-act-${release.codename}"
Expand Down
15 changes: 13 additions & 2 deletions linux/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,12 @@ ARG TARGETARCH
SHELL [ "/bin/bash", "--login", "-e", "-o", "pipefail", "-c" ]
ARG RUSTUP_HOME
ARG CARGO_HOME
ARG RUSTUP_DEFAULT_TOOLCHAIN=stable
ENV PATH=${CARGO_HOME}/bin:${PATH}
RUN curl -fsSL https://sh.rustup.rs \
| sh -s -- \
-y \
--default-toolchain=${RUSTUP_DEFAULT_TOOLCHAIN} \
--default-toolchain=stable \
--profile minimal \
&& cargo --version \
&& rustc --version

Expand Down Expand Up @@ -368,6 +368,17 @@ RUN [ "${NODE_VERSION}" != "" ] || (echo "missing build-arg NODE_VERSION" && exi
&& npm --version \
&& node --version

# Install nvm
# hadolint ignore=SC2016,SC1091
RUN export NVM_DIR=/etc/skel/.nvm \
&& mkdir -p "${NVM_DIR}" \
&& VERSION=$(curl -fsSL https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name') \
&& curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash \
&& echo 'NVM_DIR=$HOME/.nvm' | tee -a /etc/environment \
&& echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm' | tee -a /etc/skel/.bash_profile \
&& [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" \
&& nvm alias default system

# Install YARN
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg \
| apt-key add - \
Expand Down

0 comments on commit 96ca4bb

Please sign in to comment.