Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add nvm, update readme and bake-file #76

Merged
merged 2 commits into from
Oct 27, 2023
Merged

Add nvm, update readme and bake-file #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6d21ea
add nvm, update readme and bake-file
mauwii Oct 27, 2023
4011710
set rust profile to minimal
mauwii Oct 27, 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
3 changes: 0 additions & 3 deletions README.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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