Skip to content

Commit

Permalink
Update to Yardl 0.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
johnstairs committed Nov 10, 2023
1 parent df46034 commit e0ea755
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
ARG DEVCONTAINER_BASE=mcr.microsoft.com/devcontainers/base:1.0.9-ubuntu-22.04

#########################################################
# file-normalizer stage
# In order to use BuildKit remote caching, input files must have
Expand All @@ -7,7 +9,7 @@
# subsequent stage and normalize the permissions.
#########################################################

FROM mcr.microsoft.com/oss/busybox/busybox:1.33.1 as file-normalizer
FROM --platform=linux/amd64 ${DEVCONTAINER_BASE} as file-normalizer

COPY environment.yml \
.devcontainer/devcontainer.bashrc \
Expand All @@ -20,7 +22,7 @@ RUN chmod -R 555 /data/
# Installs all dependencies and tooling for development.
#########################################################

FROM mcr.microsoft.com/vscode/devcontainers/base:0.201.8-focal AS devcontainer
FROM --platform=linux/amd64 ${DEVCONTAINER_BASE} AS devcontainer

# Install needed packages and setup non-root user.
ARG USERNAME="vscode"
Expand Down Expand Up @@ -89,9 +91,8 @@ RUN mkdir -p /home/vscode/.local/share/CMakeTools \
&& chown vscode:conda /home/vscode/.local/share/CMakeTools/cmake-tools-kits.json

# Install the yardl tool
ARG YARDL_VERSION=0.3.1
ARG YARDL_VERSION=0.3.2
RUN wget --quiet "https://github.com/microsoft/yardl/releases/download/v${YARDL_VERSION}/yardl_${YARDL_VERSION}_linux_x86_64.tar.gz" \
&& tar -xzf "yardl_${YARDL_VERSION}_linux_x86_64.tar.gz" \
&& mv yardl "/opt/conda/envs/${CONDA_ENVIRONMENT_NAME}/bin/" \
&& rm "yardl_${YARDL_VERSION}_linux_x86_64.tar.gz"

2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dockerfile": "Dockerfile",
"context": ".."
},
"runArgs": ["--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],
"runArgs": ["--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined", "--platform=linux/amd64"],

// Configure tool-specific properties.
"customizations": {
Expand Down

0 comments on commit e0ea755

Please sign in to comment.