Skip to content

Commit 585ccca

Browse files
Merge branch '4GeeksAcademy:master' into master-python-programming-exercises
2 parents ce65b64 + 0fc2182 commit 585ccca

File tree

3 files changed

+26
-3
lines changed

3 files changed

+26
-3
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"extensions": ["learn-pack.learnpack-vscode"]
2222
}
2323
},
24-
"onCreateCommand": "pip3 install pytest==4.6.0 pytest-testdox mock && npm i @learnpack/learnpack@2.1.20 -g && learnpack plugins:install @learnpack/python@1.0.0"
24+
"onCreateCommand": "pip3 install pytest==6.2.5 pytest-testdox mock && npm i @learnpack/learnpack@2.1.20 -g && learnpack plugins:install @learnpack/python@1.0.0"
2525

2626
// Features to add to the dev container. More info: https://containers.dev/features.
2727
// "features": {},

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
!.gitignore
55
!.gitpod.yml
6+
!.devcontainer
7+
!.devcontainer/*
68
!.gitpod.Dockerfile
79
!bc.json
810
!learn.json

.gitpod.Dockerfile

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,28 @@
1-
21
FROM gitpod/workspace-full:latest
32

3+
SHELL ["/bin/bash", "-c"]
4+
5+
RUN sudo apt-get update \
6+
&& sudo apt-get update \
7+
&& sudo apt-get clean \
8+
&& sudo rm -rf /var/cache/apt/* /var/lib/apt/lists/* /tmp/*
9+
10+
# That Gitpod install pyenv for me? no, thanks
11+
WORKDIR /home/gitpod/
12+
RUN rm .pyenv -Rf
13+
RUN rm .gp_pyenv.d -Rf
14+
RUN curl https://pyenv.run | bash
15+
16+
17+
RUN pyenv update && pyenv install 3.10.7 && pyenv global 3.10.7
18+
RUN pip install pipenv
19+
20+
# remove PIP_USER environment
421
USER gitpod
22+
RUN if ! grep -q "export PIP_USER=no" "$HOME/.bashrc"; then printf '%s\n' "export PIP_USER=no" >> "$HOME/.bashrc"; fi
23+
RUN echo "" >> $HOME/.bashrc
24+
RUN echo "unset DATABASE_URL" >> $HOME/.bashrc
25+
RUN echo "export DATABASE_URL" >> $HOME/.bashrc
526

6-
RUN pip3 install pytest==4.4.2 pytest-testdox mock
27+
RUN pip3 install pytest==6.2.5 pytest-testdox mock
728
RUN npm i @learnpack/learnpack@2.1.20 -g && learnpack plugins:install @learnpack/python@1.0.0

0 commit comments

Comments
 (0)