Skip to content

Commit

Permalink
Merge pull request #153 from D10S0VSkY-OSS/hotfix/hcl-pytho3.11
Browse files Browse the repository at this point in the history
Hotfix/hcl pytho3.11
  • Loading branch information
D10S0VSkY-OSS authored Feb 10, 2023
2 parents 667c0f2 + 6bddc81 commit 35ea175
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 42 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/sld-api-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
- name: Build the Docker image with tag
working-directory: ./sld-api-backend
run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_USERNAME }}/sld-api:2.16.0
run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_USERNAME }}/sld-api:2.17.0

- name: Docker Push with tag
#if: github.event.pull_request.merged == true
run: docker push ${{ secrets.DOCKER_USERNAME }}/sld-api:2.16.0
run: docker push ${{ secrets.DOCKER_USERNAME }}/sld-api:2.17.0

- name: Build the Docker image
working-directory: ./sld-api-backend
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sld-dashboard-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
- name: Build the Docker image with tags
working-directory: ./sld-dashboard
run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_USERNAME }}/sld-dashboard:2.14.0
run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_USERNAME }}/sld-dashboard:2.15.0

- name: Docker Push with tags
#if: github.event.pull_request.merged == true
run: docker push ${{ secrets.DOCKER_USERNAME }}/sld-dashboard:2.14.0
run: docker push ${{ secrets.DOCKER_USERNAME }}/sld-dashboard:2.15.0

- name: Build the Docker image
working-directory: ./sld-dashboard
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sld-remote-state-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
- name: Build the Docker image with tags
working-directory: ./sld-remote-state
run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_USERNAME }}/sld-remote-state:2.9.0
run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_USERNAME }}/sld-remote-state:2.10.0

- name: Docker Push with tags
#if: github.event.pull_request.merged == true
run: docker push ${{ secrets.DOCKER_USERNAME }}/sld-remote-state:2.9.0
run: docker push ${{ secrets.DOCKER_USERNAME }}/sld-remote-state:2.10.0

- name: Build the Docker image
working-directory: ./sld-remote-state
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sld-schedule-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
- name: Build the Docker image with tags
working-directory: ./sld-schedule
run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_USERNAME }}/sld-schedule:2.5.0
run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_USERNAME }}/sld-schedule:2.6.0

- name: Docker Push with tags
#if: github.event.pull_request.merged == true
run: docker push ${{ secrets.DOCKER_USERNAME }}/sld-schedule:2.5.0
run: docker push ${{ secrets.DOCKER_USERNAME }}/sld-schedule:2.6.0

- name: Build the Docker image
working-directory: ./sld-schedule
Expand Down
2 changes: 1 addition & 1 deletion play-with-sld/kubernetes/k8s/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: Kustomization
commonLabels:
app: stack-lifecycle-deploy
environment: play
version: 2.21.0
version: 2.21.2

resources:
- mysql-service.yml
Expand Down
13 changes: 3 additions & 10 deletions sld-api-backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,13 @@ RUN groupadd --gid 10000 sld && \

RUN echo $TZ > /etc/timezone && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
apt-get -yq install software-properties-common && \
add-apt-repository ppa:deadsnakes/ppa

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
apt-get upgrade -yq && \
apt-get -yq install \
python3.11 pip default-libmysqlclient-dev zip git tzdata python3.11-dev

RUN ln -s /usr/bin/python3.11 /usr/bin/python && \
python -m pip install --upgrade setuptools && \
python -m pip install --no-cache-dir -r requirements.txt
python3.10 pip default-libmysqlclient-dev zip git tzdata && \
pip install --no-cache-dir -r requirements.txt

RUN apt-get clean autoclean && \
apt-get autoremove -y && \
Expand All @@ -36,4 +29,4 @@ rm -rf /var/lib/{apt,dpkg,cache,log}/
ADD . /app/
RUN chown -R sld /app

USER sld
USER sld
43 changes: 22 additions & 21 deletions sld-api-backend/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,66 +2,67 @@ aioredis==2.0.1
amqp==5.1.1
anyio==3.6.2
async-timeout==4.0.2
attrs==22.1.0
attrs==22.2.0
bcrypt==4.0.1
billiard==3.6.4.0
celery==5.2.7
certifi==2022.12.7
cffi==1.15.1
charset-normalizer==2.1.1
charset-normalizer==3.0.1
click==8.1.3
click-didyoumean==0.3.0
click-plugins==1.1.1
click-repl==0.2.0
croniter==1.3.8
cryptography==38.0.4
dependency-injector==4.40.0
cryptography==39.0.1
dependency-injector==4.41.0
Deprecated==1.2.13
dnspython==2.2.1
dnspython==2.3.0
ecdsa==0.18.0
email-validator==1.3.0
fastapi==0.88.0
email-validator==1.3.1
exceptiongroup==1.1.0
fastapi==0.91.0
fastapi-limiter==0.1.5
fastapi-versioning==0.10.0
greenlet==2.0.1
greenlet==2.0.2
h11==0.14.0
idna==3.4
iniconfig==1.1.1
iniconfig==2.0.0
Jinja2==3.1.2
jmespath==1.0.1
kombu==5.2.4
MarkupSafe==2.1.1
MarkupSafe==2.1.2
mysqlclient==2.1.1
packaging==21.3
packaging==23.0
passlib==1.7.4
password-strength==0.0.3.post2
pluggy==1.0.0
prompt-toolkit==3.0.33
prompt-toolkit==3.0.36
py==1.11.0
pyasn1==0.4.8
pycparser==2.21
pydantic==1.10.2
pydantic==1.10.4
pyhcl==0.4.4
PyJWT==2.6.0
PyMySQL==1.0.2
pyparsing==3.0.9
pytest==7.2.0
pytest==7.2.1
python-dateutil==2.8.2
python-jose==3.3.0
python-multipart==0.0.5
python-usernames==0.3.1
pytz==2022.6
redis==4.4.0rc4
requests==2.28.1
pytz==2022.7.1
redis==4.5.1
requests==2.28.2
rsa==4.9
six==1.16.0
sniffio==1.3.0
SQLAlchemy==1.4.44
starlette==0.22.0
SQLAlchemy==2.0.3
starlette==0.24.0
tomli==2.0.1
typing_extensions==4.4.0
urllib3==1.26.13
urllib3==1.26.14
uvicorn==0.20.0
vine==5.0.0
wcwidth==0.2.5
wcwidth==0.2.6
wrapt==1.14.1
2 changes: 1 addition & 1 deletion sld-dashboard/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cffi==1.15.1
chardet==5.1.0
charset-normalizer==2.1.1
click==8.1.3
cryptography==38.0.4
cryptography==39.0.1
Deprecated==1.2.13
dnspython==2.2.1
email-validator==1.3.0
Expand Down
2 changes: 1 addition & 1 deletion sld-remote-state/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ certifi==2022.12.7
cffi==1.15.1
charset-normalizer==2.1.1
click==8.1.3
cryptography==38.0.4
cryptography==39.0.1
dnspython==2.2.1
fastapi==0.88.0
google-api-core==2.11.0
Expand Down

0 comments on commit 35ea175

Please sign in to comment.