Skip to content

Commit dbc7070

Browse files
authored
fix: elixir, python, java, and dart publishing (#365)
1 parent a109fe6 commit dbc7070

File tree

5 files changed

+18
-11
lines changed

5 files changed

+18
-11
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ release.properties
77
*.releaseBackup
88
repos/
99
openapitools.json
10+
.venv
11+
venv

Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# 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
2-
FROM openjdk:21-bullseye
2+
FROM openjdk:21-bookworm
33

44
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates ssh bash
55

@@ -56,12 +56,12 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
5656
RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && apt-get install -y nodejs
5757
# the following is a workaround for openjdk-11-jre-headless erroring due to not having a man path in slim-debian
5858
RUN apt-get update -y
59-
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
59+
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
6060
# 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
6161

6262
RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg
6363
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
64-
RUN sudo apt-get update && sudo apt-get install google-cloud-cli
64+
RUN sudo apt-get update -y && sudo apt-get install -y --no-install-recommends google-cloud-cli
6565

6666
# https://stackoverflow.com/questions/35736598/cannot-pip-install-cryptography-in-docker-alpine-linux-3-3-with-openssl-1-0-2g
6767
#RUN apk add --no-cache \
@@ -76,9 +76,9 @@ RUN sudo apt-get update && sudo apt-get install google-cloud-cli
7676

7777
# 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
7878

79-
RUN npm install -g npm@7.21.0
79+
RUN npm install -g npm@10.8.1
8080
RUN npm i -g @openapitools/openapi-generator-cli
81-
RUN openapi-generator-cli version-manager set 5.2.1
81+
RUN openapi-generator-cli version-manager set 7.4.0
8282

8383
# dotnet
8484
ENV PATH "$PATH:/root/.dotnet"
@@ -120,7 +120,7 @@ RUN td=$(mktemp) \
120120

121121
RUN gem install bundler -v 2.3.26 && \
122122
apt-get update && \
123-
apt-get install -y --no-install-recommends ruby-dev=1:2.7+2
123+
apt-get install -y --no-install-recommends ruby-dev
124124

125125
ADD go.mod go.mod
126126
ADD go.sum go.sum

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ desired version.
2323
You may also manually build and publish this image using:
2424

2525
```shell script
26-
docker build --platform linux/amd64 -t oryd/sdk:latest .
26+
docker build -t oryd/sdk:latest .
2727
docker tag oryd/sdk:latest oryd/sdk:v0.0.53
2828
docker push oryd/sdk:v0.0.53
2929
```
@@ -33,15 +33,15 @@ docker push oryd/sdk:v0.0.53
3333
If you wish to debug some generators or build steps, you can run the image locally:
3434

3535
```shell script
36-
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
36+
docker run --mount type=bind,source="$(pwd)",target=/project --name sdk --user "$(id -u):$(id -g)" -it oryd/sdk:latest /bin/sh
3737
```
3838

3939
### Debugging Failing Tests on CI
4040

4141
If a test fails in CI, you may run the following code snippet to reproduce the failure locally:
4242

4343
```shell script
44-
docker run --platform linux/amd64 --mount type=bind,source="$(pwd)",target=/project --name sdk -it oryd/sdk:v0.0.53 /bin/bash
44+
docker run --mount type=bind,source="$(pwd)",target=/project --name sdk -it oryd/sdk:latest /bin/bash
4545

4646
export FORCE_PROJECT=client # or hydra or something else
4747
export FORCE_VERSION=$(cat /project/spec/$FORCE_PROJECT/latest) # or a specific version, e.g. v1.2.17

scripts/generate.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ elixir () {
346346
}
347347

348348
# elixir is broken right now: https://github.com/ory/sdk/issues/350
349-
#elixir
349+
elixir
350350
typescript
351351
typescript_fetch
352352
rust
@@ -356,7 +356,7 @@ php
356356
python
357357

358358
# ruby is broken right now: https://github.com/ory/sdk/issues/357
359-
# ruby
359+
ruby
360360
dotnet
361361
dart
362362

scripts/prep.sh

+5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ else
1616
version=${FORCE_VERSION}
1717
fi
1818

19+
# Python
20+
21+
python3 -m venv .venv
22+
source .venv/bin/activate
23+
1924
####################################
2025

2126
if [ -z "${FORCE_PROJECT+x}" ]; then

0 commit comments

Comments
 (0)