Skip to content

Commit 2a6bec9

Browse files
committed
add devcontainer-links postCreateCommand helper
1 parent 0fd8f0a commit 2a6bec9

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/devcontainer/devcontainer.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"runArgs": ["--network=host"],
1313
"mounts": ["source=dind-var-lib-docker,target=/var/lib/docker,type=volume"],
1414
"features": {"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}},
15-
"postCreateCommand": "sudo chown $USER /workspaces/* 2>/dev/null || true; ln -s /workspaces/konductor /home/vscode/konductor || true; direnv allow 2>/dev/null || true",
15+
"postCreateCommand": "devcontainer-links",
1616
//"workspaceMount": "source=.,target=/home/vscode/konductor,type=bind,consistency=cached",
1717
"forwardPorts": [1313, 2222, 6000, 7681, 8080],
1818
"customizations": {
@@ -151,13 +151,11 @@
151151
"ignoreLegacyWarning": true,
152152
"autoRepositoryDetection": "openEditors",
153153
"defaultCloneParentDirectory": "/home/vscode",
154+
"path": "/usr/local/bin/git",
154155
"scanRepositories": [
155156
"/home/vscode",
156-
"/home/vscode/konductor",
157-
"/home/vscode/konductor/.github/devcontainer",
158157
"/workspaces"
159-
],
160-
"path": "/usr/local/bin/git"
158+
]
161159
},
162160
"go": {
163161
"testTags": "all",

.github/devcontainer/docker/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -879,12 +879,14 @@ RUN echo \
879879

880880
#################################################################################
881881
# Load startup artifacts
882-
COPY ./bin/connect /bin/
883-
COPY ./bin/entrypoint /bin/
882+
COPY ./bin/connect /bin/
883+
COPY ./bin/entrypoint /bin/
884+
COPY ./bin/devcontainer-links /bin/
884885

885886
#################################################################################
886887
# Entrypoint & default command
887-
ENTRYPOINT /bin/entrypoint
888+
ENTRYPOINT ["/bin/entrypoint"]
889+
HEALTHCHECK --interval=120s --timeout=30s --start-period=5s --retries=3 CMD [ "true" ]
888890
CMD ["/usr/bin/env", "connect"]
889891

890892
# Ports

0 commit comments

Comments
 (0)