From 9b037b13e2dab1c55e135a7aaee896adf0deef01 Mon Sep 17 00:00:00 2001
From: aeneasr <3372410+aeneasr@users.noreply.github.com>
Date: Fri, 5 Jul 2024 15:17:20 +0200
Subject: [PATCH] chore: update packages

---
 .gitignore          |  2 ++
 Dockerfile          | 12 ++++++------
 README.md           |  6 +++---
 scripts/generate.sh |  4 ++--
 scripts/prep.sh     |  5 +++++
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index e1c01965e79..4d06271c398 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ release.properties
 *.releaseBackup
 repos/
 openapitools.json
+.venv
+venv
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 7e14300fc6a..3665f04de6a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # can't use bookworm (latest LTS as of June23) yet, as elixir/erlang does not provide packages for it yet. Check if https://binaries.erlang-solutions.com/debian/dists/bookworm/ is available to change this
-FROM openjdk:21-bullseye
+FROM openjdk:21-bookworm
 
 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates ssh bash
 
@@ -56,12 +56,12 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
 RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs
 # the following is a workaround for openjdk-11-jre-headless erroring due to not having a man path in slim-debian
 RUN apt-get update -y
-RUN apt-get install -y --no-install-recommends python3 python3-dev python3-pip ruby jq gnupg git gettext libffi-dev libssl-dev php composer php-curl php-dom php-xml php-simplexml php-xmlwriter maven pkg-config twine sudo apt-transport-https
+RUN apt-get install -y --no-install-recommends python3 python3-dev python3-full python3-pip python3-venv ruby jq gnupg git gettext libffi-dev libssl-dev php composer php-curl php-dom php-xml php-simplexml php-xmlwriter maven pkg-config twine sudo apt-transport-https
 # RUN apk add -U --no-cache ca-certificates bash nodejs npm python3 python3-dev py-pip ruby jq build-base gnupg git openssh curl gettext libffi libffi-dev openssl-dev php composer php-curl php7-tokenizer wget php-dom php-xml php-simplexml php-xmlwriter maven
 
 RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg
 RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
-RUN sudo apt-get update && sudo apt-get install google-cloud-cli
+RUN sudo apt-get update -y && sudo apt-get install -y --no-install-recommends google-cloud-cli
 
 # https://stackoverflow.com/questions/35736598/cannot-pip-install-cryptography-in-docker-alpine-linux-3-3-with-openssl-1-0-2g
 #RUN apk add --no-cache \
@@ -76,9 +76,9 @@ RUN sudo apt-get update && sudo apt-get install google-cloud-cli
 
 # RUN wget http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.2.2/openapi-generator-cli-4.2.2.jar -O openapi-generator-cli.jar
 
-RUN npm install -g npm@7.21.0
+RUN npm install -g npm@10.8.1
 RUN npm i -g @openapitools/openapi-generator-cli
-RUN openapi-generator-cli version-manager set 5.2.1
+RUN openapi-generator-cli version-manager set 7.4.0
 
 # dotnet
 ENV PATH "$PATH:/root/.dotnet"
@@ -120,7 +120,7 @@ RUN td=$(mktemp) \
 
 RUN gem install bundler -v 2.3.26 && \
 	apt-get update && \
-	apt-get install -y --no-install-recommends ruby-dev=1:2.7+2
+	apt-get install -y --no-install-recommends ruby-dev
 
 ADD go.mod go.mod
 ADD go.sum go.sum
diff --git a/README.md b/README.md
index 836f8d59e29..2d2290c49ab 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ desired version.
 You may also manually build and publish this image using:
 
 ```shell script
-docker build --platform linux/amd64 -t oryd/sdk:latest .
+docker build -t oryd/sdk:latest .
 docker tag oryd/sdk:latest oryd/sdk:v0.0.53
 docker push oryd/sdk:v0.0.53
 ```
@@ -33,7 +33,7 @@ docker push oryd/sdk:v0.0.53
 If you wish to debug some generators or build steps, you can run the image locally:
 
 ```shell script
-docker run --platform linux/amd64 --mount type=bind,source="$(pwd)",target=/project --name sdk --user "$(id -u):$(id -g)" -it oryd/sdk:v0.0.51 /bin/sh
+docker run --mount type=bind,source="$(pwd)",target=/project --name sdk --user "$(id -u):$(id -g)" -it oryd/sdk:latest /bin/sh
 ```
 
 ### Debugging Failing Tests on CI
@@ -41,7 +41,7 @@ docker run --platform linux/amd64 --mount type=bind,source="$(pwd)",target=/proj
 If a test fails in CI, you may run the following code snippet to reproduce the failure locally:
 
 ```shell script
-docker run --platform linux/amd64 --mount type=bind,source="$(pwd)",target=/project --name sdk -it oryd/sdk:v0.0.53 /bin/bash
+docker run --mount type=bind,source="$(pwd)",target=/project --name sdk -it oryd/sdk:latest /bin/bash
 
 export FORCE_PROJECT=client # or hydra or something else
 export FORCE_VERSION=$(cat /project/spec/$FORCE_PROJECT/latest) # or a specific version, e.g. v1.2.17
diff --git a/scripts/generate.sh b/scripts/generate.sh
index 824a4e691fc..05a41c0903f 100755
--- a/scripts/generate.sh
+++ b/scripts/generate.sh
@@ -346,7 +346,7 @@ elixir () {
 }
 
 # elixir is broken right now: https://github.com/ory/sdk/issues/350
-#elixir
+elixir
 typescript
 typescript_fetch
 rust
@@ -356,7 +356,7 @@ php
 python
 
 # ruby is broken right now: https://github.com/ory/sdk/issues/357
-# ruby
+ruby
 dotnet
 dart
 
diff --git a/scripts/prep.sh b/scripts/prep.sh
index 6ed43110417..2d78b50bb3b 100755
--- a/scripts/prep.sh
+++ b/scripts/prep.sh
@@ -16,6 +16,11 @@ else
   version=${FORCE_VERSION}
 fi
 
+# Python
+
+python3 -m venv .venv
+source .venv/bin/activate
+
 ####################################
 
 if [ -z "${FORCE_PROJECT+x}" ]; then