Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit fd63c90

Browse files
ChuxelChuxel
authored
Merge branch 'master' into clantz/az-block-library-scripts
2 parents 14c5786 + f6f21ad commit fd63c90

File tree

81 files changed

+544
-581
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+544
-581
lines changed

‎.github/workflows/push-and-package.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,17 @@ jobs:
8383
git fetch --tags --force
8484
git branch ${{ steps.get_tag_name.outputs.tag }}-temp-branch
8585
git add -u
86-
git commit -m 'Automated update of common script sources and hash'
86+
git commit -m 'Automated update of common script sources and hash' || export NO_UPDATES="true"
8787
8888
# Re-tag and push to origin
89-
git tag -d ${{ steps.get_tag_name.outputs.tag }}
90-
git tag ${{ steps.get_tag_name.outputs.tag }}
91-
git push --delete origin ${{ steps.get_tag_name.outputs.tag }}
92-
git push origin ${{ steps.get_tag_name.outputs.tag }}
89+
if [ "${NO_UPDATES}" != "true" ]; then
90+
git tag -d ${{ steps.get_tag_name.outputs.tag }}
91+
git tag ${{ steps.get_tag_name.outputs.tag }}
92+
git push --delete origin ${{ steps.get_tag_name.outputs.tag }}
93+
git push origin ${{ steps.get_tag_name.outputs.tag }}
94+
else
95+
echo "No updates to re-tag."
96+
fi
9397
9498
- name: Package
9599
id: package

‎build/assets/debian.Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
FROM REPLACE-ME
22

33
# ** [Optional] Uncomment this section to install additional packages. **
4-
# RUN apt-get update \
5-
# && export DEBIAN_FRONTEND=noninteractive \
4+
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
65
# && apt-get -y install --no-install-recommends <your-package-list-here>
76

‎cgmanifest.json‎

Lines changed: 87 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -979,6 +979,93 @@
979979
}
980980
}
981981
},
982+
{
983+
"Component": {
984+
"Type": "DockerImage",
985+
"DockerImage": {
986+
"Name": "ruby",
987+
"Digest": "sha256:4cdd89e947cc52c78c273953e42a6e9d94ca4cd182875fd50745550580b772f4",
988+
"Tag": "2"
989+
}
990+
}
991+
},
992+
{
993+
"Component": {
994+
"Type": "DockerImage",
995+
"DockerImage": {
996+
"Name": "ruby",
997+
"Digest": "sha256:4cdd89e947cc52c78c273953e42a6e9d94ca4cd182875fd50745550580b772f4",
998+
"Tag": "2.7"
999+
}
1000+
}
1001+
},
1002+
{
1003+
"Component": {
1004+
"Type": "DockerImage",
1005+
"DockerImage": {
1006+
"Name": "ruby",
1007+
"Digest": "sha256:d9fec6ed7ded90f6e14930884a6d6e385645d346d02f46cedbde8af563e4bb19",
1008+
"Tag": "2.6"
1009+
}
1010+
}
1011+
},
1012+
{
1013+
"Component": {
1014+
"Type": "DockerImage",
1015+
"DockerImage": {
1016+
"Name": "ruby",
1017+
"Digest": "sha256:d92df757786a564fae990d6893db5e1c96f5a8a037d05bc282985f5168fd63d2",
1018+
"Tag": "2.5"
1019+
}
1020+
}
1021+
},
1022+
{
1023+
"Component": {
1024+
"Type": "other",
1025+
"Other": {
1026+
"Name": "Debian Package: yarn",
1027+
"Version": "1.22.4-1",
1028+
"DownloadUrl": "https://dl.yarnpkg.com/debian/pool/main/y/yarn/yarn_1.22.4_all.deb"
1029+
}
1030+
}
1031+
},
1032+
{
1033+
"Component": {
1034+
"Type": "RubyGems",
1035+
"RubyGems": {
1036+
"Name": "rake",
1037+
"Version": "13.0.1"
1038+
}
1039+
}
1040+
},
1041+
{
1042+
"Component": {
1043+
"Type": "RubyGems",
1044+
"RubyGems": {
1045+
"Name": "ruby-debug-ide",
1046+
"Version": "0.7.2"
1047+
}
1048+
}
1049+
},
1050+
{
1051+
"Component": {
1052+
"Type": "RubyGems",
1053+
"RubyGems": {
1054+
"Name": "debase",
1055+
"Version": "0.2.4.1"
1056+
}
1057+
}
1058+
},
1059+
{
1060+
"Component": {
1061+
"Type": "git",
1062+
"git": {
1063+
"Name": "Nvm",
1064+
"repositoryUrl": "https://github.com/nvm-sh/nvm",
1065+
"commitHash": "f355b327d6a2a4e8020e943974086d53f00f9a02"
1066+
}
1067+
}
1068+
},
9821069
{
9831070
"Component": {
9841071
"Type": "DockerImage",
@@ -1459,16 +1546,6 @@
14591546
}
14601547
}
14611548
},
1462-
{
1463-
"Component": {
1464-
"Type": "other",
1465-
"Other": {
1466-
"Name": "Debian Package: yarn",
1467-
"Version": "1.22.4-1",
1468-
"DownloadUrl": "https://dl.yarnpkg.com/debian/pool/main/y/yarn/yarn_1.22.4_all.deb"
1469-
}
1470-
}
1471-
},
14721549
{
14731550
"Component": {
14741551
"Type": "npm",
@@ -1478,16 +1555,6 @@
14781555
}
14791556
}
14801557
},
1481-
{
1482-
"Component": {
1483-
"Type": "git",
1484-
"git": {
1485-
"Name": "Nvm",
1486-
"repositoryUrl": "https://github.com/nvm-sh/nvm",
1487-
"commitHash": "f355b327d6a2a4e8020e943974086d53f00f9a02"
1488-
}
1489-
}
1490-
},
14911558
{
14921559
"Component": {
14931560
"Type": "DockerImage",

‎container-templates/docker-compose/.devcontainer/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,5 @@ RUN apt-get update \
2626
&& apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
2727

2828
# [Optional] Uncomment this section to install additional OS packages.
29-
# RUN apt-get update \
30-
# && export DEBIAN_FRONTEND=noninteractive \
29+
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
3130
# && apt-get -y install --no-install-recommends <your-package-list-here>

‎container-templates/dockerfile/.devcontainer/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,5 @@ RUN apt-get update \
2222
&& apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
2323

2424
# [Optional] Uncomment this section to install additional OS packages.
25-
# RUN apt-get update \
26-
# && export DEBIAN_FRONTEND=noninteractive \
25+
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
2726
# && apt-get -y install --no-install-recommends <your-package-list-here>

‎containers/alpine/.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Alpine",
33
"build": {
4-
"dockerfile": "base.Dockerfile",
4+
"dockerfile": "Dockerfile",
55
// Update 'VARIANT' to pick an Alpine version: 3.10, 3.11, 3.12
66
"args": { "VARIANT": "3.12" }
77
},

‎containers/azure-ansible/.devcontainer/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ RUN apt-get update \
6666
&& rm -rf /var/lib/apt/lists/*
6767

6868
# [Optional] Uncomment this section to install additional OS packages.
69-
# RUN apt-get update \
70-
# && export DEBIAN_FRONTEND=noninteractive \
69+
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
7170
# && apt-get -y install --no-install-recommends <your-package-list-here>
7271

‎containers/azure-blockchain/.devcontainer/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ RUN sudo -u ${USERNAME} bash -c "source ${NVM_DIR}/nvm.sh \
2828
&& npm i -g ganache-cli"
2929

3030
# [Optional] Uncomment this section to install additional OS packages.
31-
# RUN apt-get update \
32-
# && export DEBIAN_FRONTEND=noninteractive \
31+
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
3332
# && apt-get -y install --no-install-recommends <your-package-list-here>
3433

‎containers/azure-cli/.devcontainer/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ RUN echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb
2323
&& rm -rf /var/lib/apt/lists/*
2424

2525
# [Optional] Uncomment this section to install additional OS packages.
26-
# RUN apt-get update \
27-
# && export DEBIAN_FRONTEND=noninteractive \
26+
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
2827
# && apt-get -y install --no-install-recommends <your-package-list-here>
2928

‎containers/azure-functions-dotnetcore-2.1/.devcontainer/Dockerfile‎

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,25 @@
11
FROM mcr.microsoft.com/dotnet/core/sdk:2.1
22

3-
# This Dockerfile adds a non-root user with sudo access. Update the “remoteUser” property in
4-
# devcontainer.json to use it. More info: https://aka.ms/vscode-remote/containers/non-root-user.
3+
# Options for setup script
4+
ARG INSTALL_ZSH="true"
5+
ARG UPGRADE_PACKAGES="false"
56
ARG USERNAME=vscode
67
ARG USER_UID=1000
78
ARG USER_GID=$USER_UID
89

910
# Install needed packages and setup non-root user. Use a separate RUN statement to add your own dependencies.
10-
RUN apt-get update \
11-
&& export DEBIAN_FRONTEND=noninteractive \
12-
&& apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \
13-
#
14-
# Verify git and needed tools are installed
15-
&& apt-get -y install \
16-
git \
17-
openssh-client \
18-
less \
19-
iproute2 \
20-
procps \
21-
curl \
22-
apt-transport-https \
23-
gnupg2 \
24-
lsb-release \
25-
#
11+
COPY library-scripts/*.sh /tmp/library-scripts/
12+
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
13+
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
2614
# Install Azure Functions and Azure CLI
2715
&& echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list \
2816
&& echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-debian-$(lsb_release -cs)-prod $(lsb_release -cs) main" > /etc/apt/sources.list.d/dotnetdev.list \
2917
&& curl -sL https://packages.microsoft.com/keys/microsoft.asc | (OUT=$(apt-key add - 2>&1) || echo $OUT) \
3018
&& apt-get update \
31-
&& apt-get install -y azure-cli azure-functions-core-tools \
32-
#
33-
# Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user.
34-
&& groupadd --gid $USER_GID $USERNAME \
35-
&& useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
36-
# [Optional] Add sudo support for the non-root user
37-
&& apt-get install -y sudo \
38-
&& echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\
39-
&& chmod 0440 /etc/sudoers.d/$USERNAME \
40-
#
19+
&& apt-get install -y azure-cli azure-functions-core-tools-2 \
4120
# Clean up
42-
&& apt-get autoremove -y \
43-
&& apt-get clean -y \
44-
&& rm -rf /var/lib/apt/lists/*
21+
&& apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts
4522

4623
# [Optional] Uncomment this section to install additional OS packages.
47-
# RUN apt-get update \
48-
# && export DEBIAN_FRONTEND=noninteractive \
24+
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
4925
# && apt-get -y install --no-install-recommends <your-package-list-here>

0 commit comments

Comments
 (0)