update packages

libre-devops · Sep 26, 2024 · 5515353 · 5515353
1 parent 7934fc9
commit 5515353
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/containers/default/Dockerfile b/containers/default/Dockerfile
@@ -264,6 +264,7 @@ RUN echo -en "\n" | /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com
     eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" && \
     brew install gcc && \
     brew install trivy && \
+    brew install pipx && \
     brew tap azure/functions && \
     brew install azure-functions-core-tools@4
 
diff --git a/containers/ubuntu/Dockerfile b/containers/ubuntu/Dockerfile
@@ -104,6 +104,10 @@ RUN curl -sSLO https://packages.microsoft.com/config/ubuntu/$(grep -oP '(?<=^DIS
     apt-get install -y powershell && \
     ln -s /usr/bin/pwsh /usr/bin/powershell
 
+RUN curl -Lo bicep https://github.com/Azure/bicep/releases/latest/download/bicep-linux-x64 && \
+    chmod +x ./bicep && \
+    sudo mv ./bicep /usr/local/bin/bicep
+
 #Install Azure Modules for Powershell - This can take a while, so setting as final step to shorten potential rebuilds
 RUN pwsh -Command Set-PSRepository -Name "PSGallery" -InstallationPolicy Trusted && \
     pwsh -Command Install-Module -Name Az -Force -AllowClobber -Scope AllUsers -Repository PSGallery && \
@@ -160,6 +164,7 @@ RUN echo -en "\n" | /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com
     eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" && \
     brew install gcc && \
     brew install trivy && \
+    brew install pipx && \
     brew tap azure/functions && \
     brew install azure-functions-core-tools@4
 
diff --git a/containers/windows-servercore2022/Dockerfile b/containers/windows-servercore2022/Dockerfile
@@ -41,6 +41,7 @@ RUN Set-ExecutionPolicy Unrestricted ;  \
     sysinternals \
     powershell-core \
     azure-cli \
+    bicep \
     git \
     7zip \
     sudo \
@@ -49,11 +50,13 @@ RUN Set-ExecutionPolicy Unrestricted ;  \
     jq \
     gh \
     golang \
-    terraform \
+    tenv \
     packer \
-    trivy
+    trivy \
+    dotnet-8.0-sdk \
+    azure-functions-core-tools
 
-RUN choco install -y cygwin --params "/InstallDir:C:\Cygwin"
+RUN choco install -y msys2
 
 # This can take a while, which is why its a separate step
 RUN pwsh -Command Set-PSRepository -Name "PSGallery" -InstallationPolicy Trusted ; \
@@ -64,6 +67,9 @@ RUN pwsh -Command Set-PSRepository -Name "PSGallery" -InstallationPolicy Trusted
 USER ContainerUser
 ENV PATH="C:\Msys2;C:\Cygwin;C:\Program Files\PowerShell\7;C:\Python312\Scripts\;C:\Python312\;C:\Program Files\Microsoft SDKs\Azure\CLI2\wbin;C:\Python311\Scripts;C:\Python311\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\dotnet\;C:\ProgramData\chocolatey\bin;C:\Users\ContainerUser\AppData\Roaming\Python\Python311\Scripts;C:\Program Files\Git\cmd;C:\Program Files\GitHub CLI\;C:\Program Files\Go\bin;C:\Program Files\PowerShell\7\;C:\Users\ContainerUser\go\bin;C:\Users\ContainerUser\scoop\apps\python\current\Scripts;C:\Users\ContainerUser\scoop\apps\python\current;C:\Users\ContainerUser\scoop\shims;C:\Users\ContainerUser\AppData\Local\Microsoft\WindowsApps;C:\Users\ContainerUser\.local\bin;C:\Users\ContainerUser\.local;C:\Program Files\OpenSSL-Win64\bin;C:\Users\ContainerUser\AppData\Local\Microsoft\WindowsApps;C:\Users\ContainerUser\AppData\Local\Pandoc\;C:\Users\ContainerUser\.dotnet\tools;C:\Users\ContainerUser\AppData\Roaming\Python\Python311\Scripts;C:\Users\ContainerUser\.dotnet\tools;C:\Program Files\PowerShell\7;C:\Python312\Scripts\;C:\Python312\;C:\Program Files\Microsoft SDKs\Azure\CLI2\wbin;C:\Python311\Scripts;C:\Python311\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\dotnet\;C:\ProgramData\chocolatey\bin;C:\Users\ContainerAdministrator\AppData\Roaming\Python\Python311\Scripts;C:\Program Files\Git\cmd;C:\Program Files\GitHub CLI\;C:\Program Files\Go\bin;C:\Program Files\PowerShell\7\;C:\Users\ContainerAdministrator\go\bin;C:\Users\ContainerAdministrator\scoop\apps\python\current\Scripts;C:\Users\ContainerAdministrator\scoop\apps\python\current;C:\Users\ContainerAdministrator\scoop\shims;C:\Users\ContainerAdministrator\AppData\Local\Microsoft\WindowsApps;C:\Users\ContainerAdministrator\.local\bin;C:\Users\ContainerAdministrator\.local;C:\Program Files\OpenSSL-Win64\bin;C:\Users\ContainerAdministrator\AppData\Local\Microsoft\WindowsApps;C:\Users\ContainerAdministrator\AppData\Local\Pandoc\;C:\Users\ContainerAdministrator\.dotnet\tools;C:\Users\ContainerAdministrator\AppData\Roaming\Python\Python311\Scripts;C:\Users\ContainerAdministrator\.dotnet\tools"
 
+RUN tenv tf install latest ; \
+    tenv tf use latest
+
 RUN iwr -useb get.scoop.sh | iex
 
 # Use Powershell instead of CMD