Skip to content

Commit

Permalink
Merge pull request #30 from kabilar/readme
Browse files Browse the repository at this point in the history
Update base image and select local Python installation
  • Loading branch information
dimitri-yatsenko authored Jul 13, 2023
2 parents b9d6a1d + c58ac5c commit a02a2e8
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 4 deletions.
6 changes: 4 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
FROM python:3.7-slim@sha256:85ddc7b500c5e33a6eec44adbde8347a8a07714f03fc638f2cf4b13837bac601
FROM python:3.9-slim@sha256:5f0192a4f58a6ce99f732fe05e3b3d00f12ae62e183886bca3ebe3d202686c7f

ENV PATH /usr/local/bin:$PATH
ENV PYTHON_VERSION 3.9.17

RUN \
adduser --system --disabled-password --shell /bin/bash vscode && \
Expand All @@ -22,7 +25,6 @@ RUN \
pip install --no-cache-dir --upgrade black pip && \
echo '. /etc/bash_completion' >> /home/vscode/.bashrc && \
echo 'export PS1="\[\e[32;1m\]\u\[\e[m\]@\[\e[34;1m\]\H\[\e[m\]:\[\e[33;1m\]\w\[\e[m\]$ "' >> /home/vscode/.bashrc && \
# dircolors -b >> /home/vscode/.bashrc && \ # somehow fix colors
apt-get clean
COPY ./requirements.txt /tmp/
RUN \
Expand Down
3 changes: 3 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
3306
],
"customizations": {
"settings": {
"python.pythonPath": "/usr/local/bin/python"
},
"vscode": {
"extensions": [
"ms-python.python@2023.8.0",
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ docker/standard_worker/.env

# vscode
.vscode/settings.json
*.code-workspace

# ssh
*.ssh
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
# Changelog

## 0.1.2 - 2023-07-13

+ Update - Pin versions for VS Code extensions
+ Update - Dev Container base Docker image - python:3.7-slim -> python:3.9-slim
+ Add - Environment variables to select local Python install over Linux distribution of Python

## 0.1.1 - 2023-06-19

+ Add - Docker image hash
+ Add - Docker image ID

## 0.1.0 - 2023-02-27

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

setup(
name="datajoint-tutorials",
version="0.1.1",
version="0.1.2",
description="DataJoint interactive tutorials",
long_description=long_description,
author="DataJoint",
Expand Down

0 comments on commit a02a2e8

Please sign in to comment.