Skip to content

Commit

Permalink
Merge pull request #1824 from WadeBarnes/main
Browse files Browse the repository at this point in the history
Fix indy-node devcontainer build issues
  • Loading branch information
WadeBarnes authored Nov 2, 2023
2 parents e6bb87d + 22af1db commit a5d3099
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 25 deletions.
5 changes: 3 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,12 @@ RUN apt-get update -y && apt-get install -y \
RUN pip3 install -U \
# Required by setup.py
setuptools==50.3.2 \
'pyzmq==22.3.0'
'pyzmq==22.3.0' \
Cython==0.29.36


# install fpm
RUN gem install --no-document rake
RUN gem install --no-document rake
RUN gem install --no-document fpm -v 1.14.2

RUN apt-get -y autoremove \
Expand Down
49 changes: 26 additions & 23 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.205.2/containers/ubuntu
{
"name": "Ubuntu",
"build": {
"dockerfile": "Dockerfile",
// Update 'VARIANT' to pick an Ubuntu version: hirsute, focal, bionic
// Use hirsute or bionic on local arm64/Apple Silicon.
"args": { "VARIANT": "focal" }
},
"name": "Ubuntu",
"build": {
"dockerfile": "Dockerfile",
// Update 'VARIANT' to pick an Ubuntu version: hirsute, focal, bionic
// Use hirsute or bionic on local arm64/Apple Silicon.
"args": { "VARIANT": "focal" }
},

// Set *default* container specific settings.json values on container create.
"settings": {},
"customizations": {
// Configure properties specific to VS Code.
"vscode": {
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"mhutchie.git-graph",
"eamodio.gitlens",
"ms-python.python"
],
// Set *default* container specific settings.json values on container create.
"settings": {}
}
},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"mhutchie.git-graph",
"eamodio.gitlens",
"ms-python.python"
],
// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "pip install .[tests]"

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "pip install .[tests]",

// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
//"remoteUser": "vscode"
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
//"remoteUser": "vscode"
}

0 comments on commit a5d3099

Please sign in to comment.