Skip to content

Commit

Permalink
fix: trying to get pyenv to compile successfully
Browse files Browse the repository at this point in the history
  • Loading branch information
shakefu authored Nov 18, 2023
1 parent 1a7bb56 commit d5187bc
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 69 deletions.
1 change: 1 addition & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"samverschueren.final-newline",
"stevencl.addDocComments",
"stkb.rewrap",
"tamasfe.even-better-toml",
"timonwong.shellcheck",
"vivaxy.vscode-conventional-commits",
"vscode-icons-team.vscode-icons",
Expand Down
121 changes: 60 additions & 61 deletions .devcontainer/extensions.sh
Original file line number Diff line number Diff line change
@@ -1,67 +1,66 @@
#!/usr/bin/env bash

EXTENSIONS=(
4ops.terraform
aaron-bond.better-comments
bierner.markdown-preview-github-styles
bungcip.better-toml
DavidAnson.vscode-markdownlint
dbaeumer.jshint
dbaeumer.vscode-eslint
eamodio.gitlens
eg2.vscode-npm-script
esbenp.prettier-vscode
gerane.Theme-IRBlack
GitHub.codespaces
GitHub.copilot
GitHub.github-vscode-theme
GitHub.remotehub
github.vscode-github-actions
GitHub.vscode-pull-request-github
golang.go
Gruntfuggly.todo-tree
hashicorp.terraform
jetmartin.bats
jmreicha.tender
joelalejandro.nrql-language
markis.code-coverage
mikestead.dotenv
ms-azuretools.vscode-docker
ms-kubernetes-tools.vscode-kubernetes-tools
ms-python.black-formatter
ms-python.flake8
ms-python.isort
ms-python.python
ms-python.vscode-pylance
ms-toolsai.jupyter-keymap
ms-vscode-remote.remote-containers
ms-vscode-remote.remote-ssh
ms-vscode-remote.remote-ssh-edit
ms-vscode.anycode-c-sharp
ms-vscode.anycode-cpp
ms-vscode.anycode-go
ms-vscode.anycode-java
ms-vscode.anycode-php
ms-vscode.anycode-python
ms-vscode.anycode-rust
ms-vscode.anycode-typescript
ms-vscode.azure-repos
ms-vscode.remote-explorer
ms-vscode.remote-repositories
ms-vsliveshare.vsliveshare
Orta.vscode-jest
pamaron.pytest-runner
redhat.vscode-yaml
renxzen.google-colab-theme
samverschueren.final-newline
stevencl.addDocComments
stkb.rewrap
timonwong.shellcheck
vivaxy.vscode-conventional-commits
vscode-icons-team.vscode-icons
vscodevim.vim
windmilleng.vscode-go-autotest
zeshuaro.vscode-python-poetry
4ops.terraform
aaron-bond.better-comments
bierner.markdown-preview-github-styles
DavidAnson.vscode-markdownlint
dbaeumer.jshint
dbaeumer.vscode-eslint
eamodio.gitlens
eg2.vscode-npm-script
esbenp.prettier-vscode
gerane.Theme-IRBlack
GitHub.codespaces
GitHub.copilot
GitHub.copilot-chat
GitHub.copilot-labs
GitHub.github-vscode-theme
GitHub.heygithub
GitHub.remotehub
github.vscode-github-actions
GitHub.vscode-pull-request-github
golang.go
Gruntfuggly.todo-tree
hashicorp.terraform
jetmartin.bats
jmreicha.tender
joelalejandro.nrql-language
markis.code-coverage
mikestead.dotenv
ms-azuretools.vscode-docker
ms-kubernetes-tools.vscode-kubernetes-tools
ms-python.black-formatter
ms-python.flake8
ms-python.isort
ms-python.python
ms-python.vscode-pylance
ms-toolsai.jupyter-keymap
ms-vscode.anycode-c-sharp
ms-vscode.anycode-cpp
ms-vscode.anycode-go
ms-vscode.anycode-java
ms-vscode.anycode-php
ms-vscode.anycode-python
ms-vscode.anycode-rust
ms-vscode.anycode-typescript
ms-vscode.azure-repos
ms-vscode.remote-repositories
ms-vsliveshare.vsliveshare
Orta.vscode-jest
pamaron.pytest-runner
redhat.vscode-yaml
renxzen.google-colab-theme
samverschueren.final-newline
stevencl.addDocComments
stkb.rewrap
tamasfe.even-better-toml
timonwong.shellcheck
vivaxy.vscode-conventional-commits
vscode-icons-team.vscode-icons
vscodevim.vim
windmilleng.vscode-go-autotest
zeshuaro.vscode-python-poetry
)

echo "Installing extensions..."
Expand Down
14 changes: 11 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,24 @@ RUN apt-get update -yqq && \

# Dependencies that pre-commit uses
RUN apt-get update -yqq && apt-get install -yqq \
shellcheck && \
shellcheck \
&& \
apt-get clean -yqq && \
rm -rf /var/lib/apt/lists/*

# Dependencies for building Python
RUN apt-get update -yqq && apt-get install -yqq \
RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \
bzip2 libbz2-dev \
libffi-dev \
libncurses-dev \
libreadline-dev \
libssl-dev \
openssl && \
lzma liblzma-dev
ncurses-dev \
openssl \
sqlite3 libsqlite3-dev \
tk-dev \
&& \
apt-get clean -yqq && \
rm -rf /var/lib/apt/lists/*

Expand Down
5 changes: 0 additions & 5 deletions install/linux_amd64/03-pyenv
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ $RUN brew "$( { [ -z "$UPGRADE" ] && echo "install"; } || echo "upgrade" )" "$NA
$RUN echo "PYENV_ROOT=$(pyenv root)" | sudo tee -a /etc/profile
$RUN echo "eval \"\$(pyenv init -)\"" | sudo tee -a /etc/profile

# These deps help us compile Python with pyenv
$RUN echo "Installing Python system library dependencies"
$RUN brew install --only-dependencies [email protected]
$RUN brew install libffi ncurses openssl

# This saves us the time of compiling Python on codespace startup
$RUN echo "Installing global Python version"
$RUN eval "$(pyenv init -)"
Expand Down

0 comments on commit d5187bc

Please sign in to comment.