diff --git a/Dockerfile b/Dockerfile index b2bd7ed81b7..f9ae3e61d51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,20 @@ -FROM openjdk:21-bookworm +FROM eclipse-temurin:21-jdk RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates ssh bash COPY scripts/build ./scripts -ENV GOLANG_VERSION 1.24.0 +ENV GOLANG_VERSION=1.24.0 -RUN set -eux; apt-get install -y --no-install-recommends bash build-essential openssl wget; +RUN set -eux; apt-get install -y --no-install-recommends bash build-essential openssl wget unzip; RUN wget https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz \ && rm -rf /usr/local/go && tar -C /usr/local -xzf go1.24.0.linux-amd64.tar.gz \ && rm go1.24.0.linux-amd64.tar.gz -ENV GOPATH /go -ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH +ENV GOPATH=/go +ENV PATH=$GOPATH/bin:/usr/local/go/bin:$PATH RUN go version @@ -30,37 +30,25 @@ RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo gpg --dear 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 -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 \ -# libressl-dev \ -# musl-dev \ -# libffi-dev && \ -# python3 -m pip install --no-cache-dir cryptography==2.1.4 && \ -# apk del \ -# libressl-dev \ -# musl-dev \ -# libffi-dev - -# 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@10.9.2 -RUN npm i -g @openapitools/openapi-generator-cli@2.17.0 -RUN npx @openapitools/openapi-generator-cli@2.17.0 version-manager set 7.4.0 +RUN npm install -g npm@11.7.0 +RUN npm i -g @openapitools/openapi-generator-cli@2.25.2 +RUN npx @openapitools/openapi-generator-cli@2.25.2 version-manager set 7.17.0 # dotnet -ENV PATH "$PATH:/root/.dotnet" +ENV PATH="$PATH:/root/.dotnet" RUN apt-get install -y --no-install-recommends \ liblttng-ust-dev \ libicu-dev \ zlib1g \ - && wget -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \ + && wget -O dotnet-install.sh https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh \ && chmod +x dotnet-install.sh \ && ./dotnet-install.sh --channel 8.0 \ && rm dotnet-install.sh # dart RUN ./scripts/install-dart.sh +ENV PATH="$PATH:/usr/lib/dart/bin" # elixir RUN apt-get -q update && apt-get install -y -q elixir && \ diff --git a/scripts/build/install-dart.sh b/scripts/build/install-dart.sh index a81072deaa9..36a3c6e2655 100755 --- a/scripts/build/install-dart.sh +++ b/scripts/build/install-dart.sh @@ -24,4 +24,4 @@ mkdir -p /usr/lib/dart mv -v dart-sdk/* /usr/lib/dart # Add the Dart SDK to the PATH -echo 'export PATH="$PATH:/usr/lib/dart/bin"' >> ~/.bashrc \ No newline at end of file +echo 'export PATH="$PATH:/usr/lib/dart/bin"' >> ~/.bashrc diff --git a/scripts/generate.sh b/scripts/generate.sh index e327dfca1cb..b13a4807c97 100755 --- a/scripts/generate.sh +++ b/scripts/generate.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -Eeuxo pipefail +set -Eexo pipefail cd "$( dirname "${BASH_SOURCE[0]}" )/.." @@ -41,8 +41,8 @@ typescript () { rm -rf "$dir" || true mkdir -p "$dir" - npx @openapitools/openapi-generator-cli@2.17.0 version-manager set 7.12.0 - npx @openapitools/openapi-generator-cli@2.17.0 generate -i "${SPEC_FILE}" \ + npx @openapitools/openapi-generator-cli@2.25.2 version-manager set 7.17.0 + npx @openapitools/openapi-generator-cli@2.25.2 generate -i "${SPEC_FILE}" \ -g typescript-axios \ -o "$dir" \ --git-user-id ory \ @@ -65,14 +65,14 @@ typescript_fetch () { rm -rf "$dir" || true mkdir -p "$dir" - npx @openapitools/openapi-generator-cli@2.17.0 version-manager set 7.12.0 + npx @openapitools/openapi-generator-cli@2.25.2 version-manager set 7.17.0 config_file=./config/client/typescript-fetch.yml.proc.yml if [ $project == "client" ]; then config_file=./config/client/typescript-client-fetch.yml.proc.yml fi - npx @openapitools/openapi-generator-cli@2.17.0 generate -i "${SPEC_FILE}" \ + npx @openapitools/openapi-generator-cli@2.25.2 generate -i "${SPEC_FILE}" \ -g typescript-fetch \ -o "$dir" \ --git-user-id ory \ @@ -104,8 +104,8 @@ java () { # new versions of the generator introduce changes to the pom dependencies. # # Read contrib/poms/README.md for upgrade instructions. - npx @openapitools/openapi-generator-cli@2.17.0 version-manager set 7.7.0 - npx @openapitools/openapi-generator-cli@2.17.0 generate -i "${SPEC_FILE}" \ + npx @openapitools/openapi-generator-cli@2.25.2 version-manager set 7.7.0 + npx @openapitools/openapi-generator-cli@2.25.2 generate -i "${SPEC_FILE}" \ -g java \ -o "$dir" \ --git-user-id ory \ @@ -126,8 +126,8 @@ php() { rm -rf "$dir" || true mkdir -p "$dir" - npx @openapitools/openapi-generator-cli@2.17.0 version-manager set 7.12.0 - npx @openapitools/openapi-generator-cli@2.17.0 generate -i "${SPEC_FILE}" \ + npx @openapitools/openapi-generator-cli@2.25.2 version-manager set 7.17.0 + npx @openapitools/openapi-generator-cli@2.25.2 generate -i "${SPEC_FILE}" \ -g php \ -o "$dir" \ --git-user-id ory \ @@ -151,8 +151,8 @@ python () { rm -rf "$dir" || true mkdir -p "$dir" - npx @openapitools/openapi-generator-cli@2.17.0 version-manager set 7.12.0 - npx @openapitools/openapi-generator-cli@2.17.0 generate -i "${SPEC_FILE}" \ + npx @openapitools/openapi-generator-cli@2.25.2 version-manager set 7.17.0 + npx @openapitools/openapi-generator-cli@2.25.2 generate -i "${SPEC_FILE}" \ -g python \ -o "$dir" \ --git-user-id ory \ @@ -171,8 +171,8 @@ ruby () { rm "${dir}/lib/${RUBY_PROJECT_NAME}/version.rb" || true - npx @openapitools/openapi-generator-cli@2.17.0 version-manager set 7.12.0 - npx @openapitools/openapi-generator-cli@2.17.0 generate -i "${SPEC_FILE}" \ + npx @openapitools/openapi-generator-cli@2.25.2 version-manager set 7.17.0 + npx @openapitools/openapi-generator-cli@2.25.2 generate -i "${SPEC_FILE}" \ -g ruby \ -o "$dir" \ --git-user-id ory \ @@ -203,8 +203,8 @@ golang () { name="${GIT_REPO}-go" fi - npx @openapitools/openapi-generator-cli@2.17.0 version-manager set 7.12.0 - npx @openapitools/openapi-generator-cli@2.17.0 generate -i "${SPEC_FILE}" \ + npx @openapitools/openapi-generator-cli@2.25.2 version-manager set 7.17.0 + npx @openapitools/openapi-generator-cli@2.25.2 generate -i "${SPEC_FILE}" \ -g go \ -o "$dir" \ --git-user-id ory \ @@ -214,9 +214,9 @@ golang () { cp "LICENSE" "clients/${PROJECT}/go" if [ "${PROJECT}" == "client" ]; then - (cd "${dir}"; rm go.mod go.sum || true; go mod init "github.com/ory/client-go"; go mod tidy -compat=1.17) + (cd "${dir}"; rm go.mod go.sum || true; go mod init "github.com/ory/client-go"; go mod tidy) else - (cd "${dir}"; rm go.mod go.sum || true; go mod init "github.com/ory/${PROJECT}-client-go/v${RAW_VERSION%%.*}"; go mod tidy -compat=1.17) + (cd "${dir}"; rm go.mod go.sum || true; go mod init "github.com/ory/${PROJECT}-client-go/v${RAW_VERSION%%.*}"; go mod tidy) fi } @@ -227,8 +227,8 @@ dotnet () { rm -rf "$dir" || true mkdir -p "$dir" - npx @openapitools/openapi-generator-cli@2.17.0 version-manager set 7.12.0 - npx @openapitools/openapi-generator-cli@2.17.0 generate -i "${SPEC_FILE}" \ + npx @openapitools/openapi-generator-cli@2.25.2 version-manager set 7.17.0 + npx @openapitools/openapi-generator-cli@2.25.2 generate -i "${SPEC_FILE}" \ -g csharp \ -o "$dir" \ --model-name-prefix "${PROJECT_UCF}" \ @@ -246,8 +246,8 @@ dart () { rm -rf "$dir" || true mkdir -p "$dir" - npx @openapitools/openapi-generator-cli@2.17.0 version-manager set 7.12.0 - npx @openapitools/openapi-generator-cli@2.17.0 generate -i "${SPEC_FILE}" \ + npx @openapitools/openapi-generator-cli@2.25.2 version-manager set 7.17.0 + npx @openapitools/openapi-generator-cli@2.25.2 generate -i "${SPEC_FILE}" \ -g dart-dio \ -o "$dir" \ --git-user-id ory \ @@ -271,8 +271,8 @@ rust () { rm -rf "$dir" || true mkdir -p "$dir" - npx @openapitools/openapi-generator-cli@2.17.0 version-manager set 7.13.0 - npx @openapitools/openapi-generator-cli@2.17.0 generate -i "${SPEC_FILE}" \ + npx @openapitools/openapi-generator-cli@2.25.2 version-manager set 7.17.0 + npx @openapitools/openapi-generator-cli@2.25.2 generate -i "${SPEC_FILE}" \ -g rust \ -o "$dir" \ --git-user-id ory \ @@ -301,9 +301,8 @@ elixir () { file="${dir}/mix.exs" - # 7.7.0 - npx @openapitools/openapi-generator-cli@2.17.0 version-manager set 7.12.0 - npx @openapitools/openapi-generator-cli@2.17.0 generate -i "${SPEC_FILE}" \ + npx @openapitools/openapi-generator-cli@2.25.2 version-manager set 7.12.0 + npx @openapitools/openapi-generator-cli@2.25.2 generate -i "${SPEC_FILE}" \ -g elixir \ -o "$dir" \ --git-user-id ory \ @@ -332,8 +331,7 @@ java php python ruby -# TODO: https://github.com/ory/sdk/issues/434 -# dotnet -dart +dotnet +# dart cleanup diff --git a/scripts/prep.sh b/scripts/prep.sh index 83dd03c796e..e9aa74e1ea0 100755 --- a/scripts/prep.sh +++ b/scripts/prep.sh @@ -1,10 +1,10 @@ #!/bin/bash -set -Eeuxo pipefail +set -Eexo pipefail cd "$( dirname "${BASH_SOURCE[0]}" )/.." -source "$HOME/.bashrc" || true -source "$HOME/.cargo/env" || true +source "$HOME/.bashrc" +source "$HOME/.cargo/env" if [ -z "${FORCE_VERSION+x}" ]; then if [ -z "$(git log -1 --pretty=%B | grep "Add spec for")" ]; then diff --git a/scripts/test.sh b/scripts/test.sh index 03eb30f88bb..6f898d8b36e 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -Eeuxo pipefail +set -Eexo pipefail cd "$( dirname "${BASH_SOURCE[0]}" )/.."