Skip to content

Commit e66b4e7

Browse files
mikaEzmikaEz
authored
Merge pull request #66 from T-Systems-MMS/rndmh3ro-patch-1
remove version pinnings from example
2 parents 4c85ba7 + fb473db commit e66b4e7

File tree

3 files changed

+22
-21
lines changed

3 files changed

+22
-21
lines changed

‎README.MD‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ Tools to be installed within the DMC.
5656
| WORKDIR | no | /root | | | |
5757
| PACKAGES | no | | list of packages to be installed | | packages:<br>&nbsp;&nbsp;- ansible<br>&nbsp;&nbsp;- docker-ce<br>&nbsp;&nbsp;- helm<br>&nbsp;&nbsp;- kubectl |
5858
| REPOSITORIES | no | | further repositories that should be used, currently the following are defined with defaults **_[hashicorp, docker, microsoft]_** | repositories:<br>&nbsp;&nbsp;docker: {}<br>&nbsp;&nbsp;microsoft: {}<br>&nbsp;&nbsp;hashicorp: {} | repositories:<br>&nbsp;&nbsp;mongodb:<br>&nbsp;&nbsp;&nbsp;&nbsp;gpg: https://www.mongodb.org/static/pgp/server-6.0.asc<br>&nbsp;&nbsp;&nbsp;&nbsp;entry: https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/6.0 multiverse |
59-
| BINARIES | no | | binaries that should be installed, currently the following are supported **_[github, google] | github:<br>&nbsp;&nbsp;- remotemobprogramming/mob=linux_amd64=v3.2.0<br>&nbsp;&nbsp;- derailed/k9s=Linux_x86_64<br>google:<br>&nbsp;&nbsp;- google-cloud-cli=403.0.0-0 | |
60-
| REPOSITORIES_HASHICORP_GPG | no | `https://apt.releases.hashicorp.com/gpg` | default | | |
61-
| REPOSITORIES_HASHICORP_ENTRY | no | `'https://apt.releases.hashicorp.com $(lsb_release -cs) main'` | default | | |
62-
| REPOSITORIES_DOCKER_GPG | no | `https://download.docker.com/linux/ubuntu/gpg` | default | | |
63-
| REPOSITORIES_DOCKER__ENTRY | no | `'https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable'` | default | | |
64-
| REPOSITORIES_MICROSOFT_GPG | no | `https://packages.microsoft.com/keys/microsoft.asc` | default | | |
65-
| REPOSITORIES_MICROSOFT_ENTRY | | `'https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main'` | default | | |
66-
| BINARIES_GITHUB_URI | no | `https://api.github.com/repos` | default | | |
67-
| BINARIES_GOOGLE_URI | no | `https://packages.cloud.google.com/apt/dists/cloud-sdk/main/binary-arm64/Packages` | default | | |
59+
| BINARIES | no | | binaries that should be installed, currently the following are supported **_[github, google] | github:<br>&nbsp;&nbsp;- remotemobprogramming/mob=linux_amd64=v3.2.0<br>&nbsp;&nbsp;- derailed/k9s=Linux_x86_64<br>google:<br>&nbsp;&nbsp;- google-cloud-cli | |
60+
| REPOSITORIES_HASHICORP_GPG | no | `https://apt.releases.hashicorp.com/gpg` | default | | |
61+
| REPOSITORIES_HASHICORP_ENTRY | no | `'https://apt.releases.hashicorp.com $(lsb_release -cs) main'` | default | | |
62+
| REPOSITORIES_DOCKER_GPG | no | `https://download.docker.com/linux/ubuntu/gpg` | default | | |
63+
| REPOSITORIES_DOCKER__ENTRY | no | `'https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable'` | default | | |
64+
| REPOSITORIES_MICROSOFT_GPG | no | `https://packages.microsoft.com/keys/microsoft.asc` | default | | |
65+
| REPOSITORIES_MICROSOFT_ENTRY | | `'https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main'` | default | | |
66+
| BINARIES_GITHUB_URI | no | `https://api.github.com/repos` | default | | |
67+
| BINARIES_GOOGLE_URI | no | `https://packages.cloud.google.com/apt/dists/cloud-sdk/main/binary-arm64/Packages` | default | | |
6868

6969
#### Tool Config
7070

‎examples/full_build.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ packages:
22
- ansible
33
- kubectl
44
- helm
5-
- terraform=1.1.7
5+
- terraform
66
- nomad
77
- consul
88
- docker-ce
@@ -18,33 +18,33 @@ repositories:
1818
entry: https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/6.0 multiverse
1919
binaries:
2020
github:
21-
- remotemobprogramming/mob=linux_amd64=v3.2.0
21+
- remotemobprogramming/mob=linux_amd64
2222
- derailed/k9s=Linux_x86_64
2323
google:
24-
- google-cloud-cli=403.0.0-0
24+
- google-cloud-cli
2525
requirements:
2626
pip:
2727
- packaging
2828
- requests[security]
2929
- xmltodict
30-
- azure-cli-core=2.34.0
31-
- azure-common=1.1.11
30+
- azure-cli-core
31+
- azure-common
3232
- awsume
3333
ansible:
3434
roles:
3535
- t_systems_mms.grafana
3636
collections:
37-
- t_systems_mms.acme=2.3.1
38-
- t_systems_mms.icinga_director=1.28.0
37+
- t_systems_mms.acme
38+
- t_systems_mms.icinga_director
3939
extensions:
4040
az:
41-
- front-door=1.0.15
41+
- front-door
4242
google:
4343
- gsutil
4444
- gke-gcloud-auth-plugin
4545
- kubectl
4646
helm:
47-
- https://github.com/databus23/helm-diff=3.5.0
47+
- https://github.com/databus23/helm-diff
4848
- https://github.com/jkroepke/helm-secrets
4949
profiles:
5050
.vimrc:

‎template.d/13_binaries‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ RUN if [ -n "${BINARIES}" ]; then \
77
BINARY_PACKAGE_URL=$(curl -fsSL "${BINARY_PACKAGE_URI}" | grep -Po '"browser_download_url": "\K.*?(?=\")' | grep -P "${BINARY_PACKAGE_VERSION}") && \
88
mkdir -p ./github && curl -SsL --retry 5 "${BINARY_PACKAGE_URL}" | tar xz -C ./github && \
99
chmod -R +x ./github/* && mv ./github/* /usr/local/bin/; done; fi && \
10-
if [ "${BINARY_REPO}" = "GOOGLE" ]; then for BINARY_PACKAGE in ${BINARY_PACKAGES}; do BINARY_PACKAGE_VERSION=$(curl -fSsL "${BINARY_URI}" | grep -P "${BINARY_PACKAGE//=/.*}" | cut -d '_' -f2 | sort -n | grep "$(echo "${BINARY_PACKAGE}" | cut -d '=' -f2)" | tail -n1 | cut -d '-' -f1) && \
11-
BINARY_PACKAGE_URI="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/$(echo "${BINARY_PACKAGE}" | cut -d '=' -f1)-${BINARY_PACKAGE_VERSION}-linux-x86_64.tar.gz" && \
12-
mkdir -p ./google && curl -SsL --retry 5 "${BINARY_PACKAGE_URI}" | tar xz -C ./google && \
10+
if [ "${BINARY_REPO}" = "GOOGLE" ]; then for BINARY_PACKAGE in ${BINARY_PACKAGES}; do BINARY_PACKAGE_URI=$(echo "${BINARY_PACKAGE}" | awk -F '=' '{ if (!$2) version=""; else version=$2; printf("%s_%s", $1, version)}') && \
11+
BINARY_PACKAGE_VERSION=$(curl -fSsL "${BINARY_URI}" | grep "${BINARY_PACKAGE_URI}" | cut -d '_' -f2 | sort -un | tail -n1 | cut -d '-' -f1) && \
12+
BINARY_PACKAGE_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/$(echo ${BINARY_PACKAGE} | cut -d '=' -f1)-${BINARY_PACKAGE_VERSION}-linux-x86_64.tar.gz" && \
13+
mkdir -p ./google && curl -SsL --retry 5 "${BINARY_PACKAGE_URL}" | tar xz -C ./google && \
1314
chmod -R +x ./google/* && \
1415
sh ./google/*/install.sh --quiet --command-completion true --bash-completion true --path-update true; done; fi; done \
1516
fi

0 commit comments

Comments
 (0)