Skip to content

Commit fcefe6a

Browse files
RossBugginsNHSRossBugginsNHS
committed
perf improvements.
1 parent 840dce2 commit fcefe6a

File tree

8 files changed

+248
-20
lines changed

8 files changed

+248
-20
lines changed

‎src/devcontainers/base/.devcontainer/.dockerignore‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Git
2+
.git
3+
.gitignore
4+
.gitattributes
5+
6+
# Documentation
7+
*.md
8+
README*
9+
LICENSE*
10+
CHANGELOG*
11+
12+
# IDE
13+
.vscode
14+
.idea
15+
*.swp
16+
*.swo
17+
*~
18+
19+
# CI/CD
20+
.github
21+
.gitlab-ci.yml
22+
.travis.yml
23+
azure-pipelines.yml
24+
25+
# Node
26+
node_modules
27+
npm-debug.log
28+
yarn-error.log
29+
30+
# Python
31+
__pycache__
32+
*.py[cod]
33+
*$py.class
34+
.pytest_cache
35+
.coverage
36+
*.egg-info
37+
dist
38+
build
39+
.tox
40+
.venv
41+
venv
42+
env
43+
44+
# Logs
45+
*.log
46+
logs
47+
48+
# OS
49+
.DS_Store
50+
Thumbs.db
51+
52+
# Temporary files
53+
tmp
54+
temp
55+
*.tmp

‎src/devcontainers/base/.devcontainer/Dockerfile‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# syntax=docker/dockerfile:1
2+
13
ARG BASE_CONTAINER_NAME
24
ARG CONTAINER_NAME
35
ARG BASE_IMAGE_TAG
@@ -11,13 +13,13 @@ ARG BASE_IMAGE_TAG
1113
ARG BASE_CONTAINER_PREFIX
1214
ARG SCRIPTS_DIR
1315

14-
RUN test -n ${BASE_CONTAINER_NAME}
15-
RUN test -n ${CONTAINER_NAME}
16-
RUN test -n ${BASE_IMAGE_TAG}
17-
RUN test -n ${BASE_CONTAINER_PREFIX}
16+
RUN test -n "${BASE_CONTAINER_NAME}" && \
17+
test -n "${CONTAINER_NAME}" && \
18+
test -n "${BASE_IMAGE_TAG}" && \
19+
test -n "${BASE_CONTAINER_PREFIX}"
1820

1921
ENV BASE_IMAGE_TAG=${BASE_IMAGE_TAG}
2022

21-
COPY scripts ${SCRIPTS_DIR}/${CONTAINER_NAME}
23+
COPY --chmod=755 scripts ${SCRIPTS_DIR}/${CONTAINER_NAME}
2224
WORKDIR ${SCRIPTS_DIR}/${CONTAINER_NAME}
2325
RUN ./install.sh

‎src/devcontainers/default/.devcontainer/.dockerignore‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Git
2+
.git
3+
.gitignore
4+
.gitattributes
5+
6+
# Documentation
7+
*.md
8+
README*
9+
LICENSE*
10+
CHANGELOG*
11+
12+
# IDE
13+
.vscode
14+
.idea
15+
*.swp
16+
*.swo
17+
*~
18+
19+
# CI/CD
20+
.github
21+
.gitlab-ci.yml
22+
.travis.yml
23+
azure-pipelines.yml
24+
25+
# Node
26+
node_modules
27+
npm-debug.log
28+
yarn-error.log
29+
30+
# Python
31+
__pycache__
32+
*.py[cod]
33+
*$py.class
34+
.pytest_cache
35+
.coverage
36+
*.egg-info
37+
dist
38+
build
39+
.tox
40+
.venv
41+
venv
42+
env
43+
44+
# Logs
45+
*.log
46+
logs
47+
48+
# OS
49+
.DS_Store
50+
Thumbs.db
51+
52+
# Temporary files
53+
tmp
54+
temp
55+
*.tmp

‎src/devcontainers/default/.devcontainer/Dockerfile‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# syntax=docker/dockerfile:1
2+
13
ARG BASE_CONTAINER_NAME
24
ARG CONTAINER_NAME
35
ARG BASE_IMAGE_TAG
@@ -11,13 +13,13 @@ ARG BASE_IMAGE_TAG
1113
ARG BASE_CONTAINER_PREFIX
1214
ARG SCRIPTS_DIR
1315

14-
RUN test -n ${BASE_CONTAINER_NAME}
15-
RUN test -n ${CONTAINER_NAME}
16-
RUN test -n ${BASE_IMAGE_TAG}
17-
RUN test -n ${BASE_CONTAINER_PREFIX}
16+
RUN test -n "${BASE_CONTAINER_NAME}" && \
17+
test -n "${CONTAINER_NAME}" && \
18+
test -n "${BASE_IMAGE_TAG}" && \
19+
test -n "${BASE_CONTAINER_PREFIX}"
1820

1921
ENV DEFAULT_IMAGE_TAG=${BASE_IMAGE_TAG}
2022

21-
COPY scripts ${SCRIPTS_DIR}/${CONTAINER_NAME}
23+
COPY --chmod=755 scripts ${SCRIPTS_DIR}/${CONTAINER_NAME}
2224
WORKDIR ${SCRIPTS_DIR}/${CONTAINER_NAME}
2325
RUN ./install.sh

‎src/devcontainers/loaded-codespaces/.devcontainer/.dockerignore‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Git
2+
.git
3+
.gitignore
4+
.gitattributes
5+
6+
# Documentation
7+
*.md
8+
README*
9+
LICENSE*
10+
CHANGELOG*
11+
12+
# IDE
13+
.vscode
14+
.idea
15+
*.swp
16+
*.swo
17+
*~
18+
19+
# CI/CD
20+
.github
21+
.gitlab-ci.yml
22+
.travis.yml
23+
azure-pipelines.yml
24+
25+
# Node
26+
node_modules
27+
npm-debug.log
28+
yarn-error.log
29+
30+
# Python
31+
__pycache__
32+
*.py[cod]
33+
*$py.class
34+
.pytest_cache
35+
.coverage
36+
*.egg-info
37+
dist
38+
build
39+
.tox
40+
.venv
41+
venv
42+
env
43+
44+
# Logs
45+
*.log
46+
logs
47+
48+
# OS
49+
.DS_Store
50+
Thumbs.db
51+
52+
# Temporary files
53+
tmp
54+
temp
55+
*.tmp

‎src/devcontainers/loaded-codespaces/.devcontainer/Dockerfile‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# syntax=docker/dockerfile:1
2+
13
ARG BASE_CONTAINER_NAME
24
ARG CONTAINER_NAME
35
ARG BASE_IMAGE_TAG
@@ -11,13 +13,13 @@ ARG BASE_IMAGE_TAG
1113
ARG BASE_CONTAINER_PREFIX
1214
ARG SCRIPTS_DIR
1315

14-
RUN test -n ${BASE_CONTAINER_NAME}
15-
RUN test -n ${CONTAINER_NAME}
16-
RUN test -n ${BASE_IMAGE_TAG}
17-
RUN test -n ${BASE_CONTAINER_PREFIX}
16+
RUN test -n "${BASE_CONTAINER_NAME}" && \
17+
test -n "${CONTAINER_NAME}" && \
18+
test -n "${BASE_IMAGE_TAG}" && \
19+
test -n "${BASE_CONTAINER_PREFIX}"
1820

1921
ENV LOADED_CODESPACES_IMAGE_TAG=${BASE_IMAGE_TAG}
2022

21-
COPY scripts ${SCRIPTS_DIR}/${CONTAINER_NAME}
23+
COPY --chmod=755 scripts ${SCRIPTS_DIR}/${CONTAINER_NAME}
2224
WORKDIR ${SCRIPTS_DIR}/${CONTAINER_NAME}
2325
RUN ./install.sh

‎src/devcontainers/loaded/.devcontainer/.dockerignore‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Git
2+
.git
3+
.gitignore
4+
.gitattributes
5+
6+
# Documentation
7+
*.md
8+
README*
9+
LICENSE*
10+
CHANGELOG*
11+
12+
# IDE
13+
.vscode
14+
.idea
15+
*.swp
16+
*.swo
17+
*~
18+
19+
# CI/CD
20+
.github
21+
.gitlab-ci.yml
22+
.travis.yml
23+
azure-pipelines.yml
24+
25+
# Node
26+
node_modules
27+
npm-debug.log
28+
yarn-error.log
29+
30+
# Python
31+
__pycache__
32+
*.py[cod]
33+
*$py.class
34+
.pytest_cache
35+
.coverage
36+
*.egg-info
37+
dist
38+
build
39+
.tox
40+
.venv
41+
venv
42+
env
43+
44+
# Logs
45+
*.log
46+
logs
47+
48+
# OS
49+
.DS_Store
50+
Thumbs.db
51+
52+
# Temporary files
53+
tmp
54+
temp
55+
*.tmp

‎src/devcontainers/loaded/.devcontainer/Dockerfile‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# syntax=docker/dockerfile:1
2+
13
ARG BASE_CONTAINER_NAME
24
ARG CONTAINER_NAME
35
ARG BASE_IMAGE_TAG
@@ -11,13 +13,13 @@ ARG BASE_IMAGE_TAG
1113
ARG BASE_CONTAINER_PREFIX
1214
ARG SCRIPTS_DIR
1315

14-
RUN test -n ${BASE_CONTAINER_NAME}
15-
RUN test -n ${CONTAINER_NAME}
16-
RUN test -n ${BASE_IMAGE_TAG}
17-
RUN test -n ${BASE_CONTAINER_PREFIX}
16+
RUN test -n "${BASE_CONTAINER_NAME}" && \
17+
test -n "${CONTAINER_NAME}" && \
18+
test -n "${BASE_IMAGE_TAG}" && \
19+
test -n "${BASE_CONTAINER_PREFIX}"
1820

1921
ENV LOADED_IMAGE_TAG=${BASE_IMAGE_TAG}
2022

21-
COPY scripts ${SCRIPTS_DIR}/${CONTAINER_NAME}
23+
COPY --chmod=755 scripts ${SCRIPTS_DIR}/${CONTAINER_NAME}
2224
WORKDIR ${SCRIPTS_DIR}/${CONTAINER_NAME}
2325
RUN ./install.sh

0 commit comments

Comments
 (0)