Skip to content

Commit

Permalink
Merge pull request #57 from lauris-tw/remove_docker_setup
Browse files Browse the repository at this point in the history
Remove docker setup and update readme
  • Loading branch information
lauris-tw authored Jun 19, 2024
2 parents 6fef747 + 65a81ae commit 665cfe2
Show file tree
Hide file tree
Showing 40 changed files with 141 additions and 1,605 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/local-setup-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
poetry install
- name: Run local unit tests
run: |
./go.sh run-local-unit-test
poetry run python -m pytest tests/unit
- name: Run local integration tests
run: |
./go.sh run-local-integration-test
poetry run python -m pytest tests/integration
windows:
runs-on: windows-latest
Expand Down Expand Up @@ -65,11 +65,10 @@ jobs:
winutils.exe chmod 777 D:\a\dataengineer-transformations-python\dataengineer-transformations-python
- name: Install Python Dependencies
run: |
scripts\install.bat
poetry install
- name: Run local unit tests
run: |
.\go.ps1 run-local-unit-test
poetry run python -m pytest tests/unit
- name: Run local integration tests
run: |
.\go.ps1 run-local-integration-test
poetry run python -m pytest tests/integration
10 changes: 3 additions & 7 deletions .gitpod.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,14 @@ USER root
WORKDIR /opt
RUN if [ "$(arch)" = "aarch64" ] ; then ARCHITECTURE="aarch64" ; else ARCHITECTURE="x64"; fi && \
wget -O OpenJDK.tar.gz https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_${ARCHITECTURE}_linux_hotspot_11.0.11_9.tar.gz && \
wget -O scala.tgz https://downloads.lightbend.com/scala/2.13.5/scala-2.13.5.tgz && \
wget -O spark-hadoop.tgz https://archive.apache.org/dist/spark/spark-3.5.1/spark-3.5.1-bin-hadoop3.tgz
RUN tar xzf OpenJDK.tar.gz && \
tar xvf scala.tgz && \
tar xvf spark-hadoop.tgz
ENV PATH="/opt/jdk-11.0.11+9/bin:/opt/scala-2.13.5/bin:/opt/spark-3.5.1-bin-hadoop3/bin:$PATH"

ENV JAVA_HOME="/opt/jdk-11.0.11+9" \
PATH="/opt/jdk-11.0.11+9/bin:$PATH"

#TODO : Change the user to non root user
#USER 185
WORKDIR /app

COPY ./pyproject.toml /app/pyproject.toml

RUN pyenv install 3.11.4 && pyenv global 3.11.4
RUN pyenv install 3.11.4 && pyenv global 3.11.4 && poetry env use "${HOME}/.pyenv/versions/3.11.4/bin/python3"
6 changes: 2 additions & 4 deletions .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ image:

tasks:
- init: |
pyenv install 3.11.4
pyenv shell 3.11.4
poetry env use "${HOME}/.pyenv/versions/3.11.4/bin/python3"
poetry install
poetry env info
make tests
poetry run python -m pytest test/unit
poetry run python -m pytest tests/integration
5 changes: 2 additions & 3 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"recommendations": ["ms-python.python", "donjayamanne.python-environment-manager"]
}

"recommendations": ["ms-python.python"]
}
24 changes: 0 additions & 24 deletions Dockerfile

This file was deleted.

229 changes: 0 additions & 229 deletions README-DOCKER.md

This file was deleted.

Loading

0 comments on commit 665cfe2

Please sign in to comment.