Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
"containerEnv": {
"EDITOR_VSCODE": "true"
},

"features": {
"docker-in-docker": {
"version": "latest"
},
"github-cli": "latest"
},

// Set *default* container specific settings.json values on container create.
"settings": {
Expand Down
8 changes: 8 additions & 0 deletions docker/app.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ EXPOSE 8000

ENV DEBIAN_FRONTEND=noninteractive

# Add Docker Source
RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \
$(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null

RUN apt-get update

# apt-get upgrade is normally not a good idea, but this is a dev container
Expand All @@ -26,6 +31,7 @@ RUN apt-get install -qy \
bash \
build-essential \
curl \
docker-ce-cli \
enscript \
fish \
gawk \
Expand All @@ -48,9 +54,11 @@ RUN apt-get install -qy \
libxtst6 \
libmagic-dev \
libmariadb-dev \
libmemcached-tools \
libtidy-dev \
locales \
mariadb-client \
memcached \
netcat \
nano \
pigz \
Expand Down
5 changes: 5 additions & 0 deletions docker/scripts/app-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,16 @@ for sub in \
done

# Wait for DB container

if [ -n "$EDITOR_VSCODE" ]; then
echo "Waiting for DB container to come online ..."
/usr/local/bin/wait-for localhost:3306 -- echo "DB ready"
fi

# Run memcached

/usr/bin/memcached -u root -d

# Initial checks

echo "Running initial checks..."
Expand Down