From 33b94f7247303235ed235d95ab8f9041bfabb673 Mon Sep 17 00:00:00 2001
From: Caroline Ott <caroline.ott1994@gmail.com>
Date: Thu, 1 Feb 2024 15:49:26 +0100
Subject: [PATCH] Add conditional copy to dockerfile and dockerfile to cwl
---
workflows/FSharpArcCapsule.cwl | 5 ++++-
workflows/FSharpArcCapsule/Dockerfile | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/workflows/FSharpArcCapsule.cwl b/workflows/FSharpArcCapsule.cwl
index 2602936..f3aa1c3 100644
--- a/workflows/FSharpArcCapsule.cwl
+++ b/workflows/FSharpArcCapsule.cwl
@@ -2,7 +2,8 @@ cwlVersion: v1.2
class: CommandLineTool
hints:
DockerRequirement:
- dockerPull: mcr.microsoft.com/dotnet/sdk:6.0
+ dockerImageId: "devcontainer"
+ dockerFile: {$include: "FSharpArcCapsule/Dockerfile"}
requirements:
- class: InitialWorkDirRequirement
listing:
@@ -13,6 +14,8 @@ requirements:
envDef:
- envName: DOTNET_NOLOGO
envValue: "true"
+ - envName: CWL
+ envValue: "true"
- class: NetworkAccess
networkAccess: true
baseCommand: [dotnet, fsi, "./arc/workflows/FSharpArcCapsule/script.fsx"]
diff --git a/workflows/FSharpArcCapsule/Dockerfile b/workflows/FSharpArcCapsule/Dockerfile
index a32264b..982b4cd 100644
--- a/workflows/FSharpArcCapsule/Dockerfile
+++ b/workflows/FSharpArcCapsule/Dockerfile
@@ -3,7 +3,7 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0
#FROM r-base
# Copy endpoint specific user settings into container to specify
# .NET Core should be used as the runtime.
-COPY .devcontainer/settings.vscode.json /root/.vscode-remote/data/Machine/settings.json
+COPY *.devcontainer/settings.vscode.json /root/.vscode-remote/data/Machine/settings.json
# Install git, process tools
RUN apt-get update && apt-get -y install git procps
--
GitLab