From b92996d6de58748f73b58aeea9ca3b879ae798ec Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Wed, 30 Aug 2023 18:51:56 +0300
Subject: [PATCH] Workbench: Add gobjc++.
Needed for some compilations. Also sort the packages.
---
workbench/Dockerfile | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/workbench/Dockerfile b/workbench/Dockerfile
index d01ecdd..db1e460 100644
--- a/workbench/Dockerfile
+++ b/workbench/Dockerfile
@@ -6,6 +6,8 @@ RUN apt-get update && \
curl --location --silent --fail --show-error https://github.com/kubernetes/kompose/releases/download/v1.26.1/kompose_1.26.1_amd64.deb --output /tmp/kompose.deb && \
curl --location --silent --fail --show-error https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb --output /tmp/session-manager-plugin.deb && \
DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
+ /tmp/kompose.deb \
+ /tmp/session-manager-plugin.deb \
adb \
apache2-utils \
aspell-he \
@@ -45,11 +47,12 @@ RUN apt-get update && \
gir1.2-ostree-1.0 \
git \
gnupg \
+ go-md2man \
+ gobjc++ \
golang \
gomplate \
google-cloud-cli-skaffold \
google-cloud-sdk \
- go-md2man \
gpgv \
helm \
hugo \
@@ -63,7 +66,6 @@ RUN apt-get update && \
jp \
jq \
keyutils \
- /tmp/kompose.deb \
kops \
krb5-config \
kubectl \
@@ -121,7 +123,6 @@ RUN apt-get update && \
reprepro \
rsync \
ruby-dev \
- /tmp/session-manager-plugin.deb \
sharutils \
shellcheck \
signify-openbsd \
@@ -160,27 +161,28 @@ RUN apt-get update && \
echo 'resolvelib==0.5.4' > "$PIP_CONSTRAINT" && \
python3 -m pip install --use-deprecated=legacy-resolver --no-cache-dir --break-system-packages \
https://github.com/aws/aws-cli/archive/refs/heads/v2.zip \
+ Glances \
+ PyGObject \
+ PyMySQL \
ansible \
ansible-runner \
awslogs \
bcrypt \
black \
- bump2version \
- colorama \
boto \
boto3 \
+ bump2version \
chalice \
check-manifest \
+ colorama \
cookiecutter \
cryptography \
+ curator-opensearch \
dnspython \
docker \
- curator-opensearch \
- opensearch-py[async] \
fabric \
flit \
github3.py \
- Glances \
gunicorn \
hashin \
httpbin \
@@ -195,14 +197,15 @@ RUN apt-get update && \
magic-wormhole \
mycli \
netaddr \
+ opensearch-py[async] \
paramiko \
parse \
passhole \
passlib \
pdm \
pgcli \
- pipenv \
pip-tools \
+ pipenv \
poetry \
pre-commit \
protobuf \
@@ -210,8 +213,6 @@ RUN apt-get update && \
pur \
pygments \
pymongo \
- PyMySQL \
- PyGObject \
pyopenssl \
'python-gitlab[autocompletion,yaml]' \
python-hcl2 \
--
GitLab