zoriya/flood
1
0
Fork 0
mirror of https://github.com/zoriya/flood.git synced 2025-12-05 23:06:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

.devcontainer: fix compatibility with archs other than amd64

Browse Source
This commit is contained in:
Jesse Chan
2021-02-04 12:38:33 +00:00
parent 4c3d31c2b3
commit b7913f7b91
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.devcontainer/Dockerfile
View File

@@ -17,16 +17,16 @@ COPY ./.devcontainer/library-scripts /tmp/library-scripts/
# Configure base container
RUN /bin/bash /tmp/library-scripts/common-debian.sh true vscode 1000 1000 true
# Install prerequisites
RUN apt update
RUN apt install -y \
dpkg-dev software-properties-common
# Configure Docker-from-Docker
RUN /bin/bash /tmp/library-scripts/docker-debian.sh true "/var/run/docker-host.sock" "/var/run/docker.sock" vscode false
ENTRYPOINT ["/usr/local/share/docker-init.sh"]
CMD ["sleep", "infinity"]
# Install prerequisites
RUN apt update
RUN apt install -y \
software-properties-common
# Install Node.js
RUN curl -sL https://deb.nodesource.com/setup_15.x | bash -
RUN apt install -y \

4
.devcontainer/library-scripts/docker-debian.sh
View File

@@ -66,12 +66,12 @@ else
DISTRO=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
CODENAME=$(lsb_release -cs)
curl -s https://packages.microsoft.com/keys/microsoft.asc | (OUT=$(apt-key add - 2>&1) || echo $OUT)
echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-${DISTRO}-${CODENAME}-prod ${CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
echo "deb [arch=`dpkg-architecture -q DEB_BUILD_ARCH`] https://packages.microsoft.com/repos/microsoft-${DISTRO}-${CODENAME}-prod ${CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
apt-get update
apt-get -y install --no-install-recommends moby-cli
else
curl -fsSL https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/gpg | (OUT=$(apt-key add - 2>&1) || echo $OUT)
echo "deb [arch=amd64] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list
echo "deb [arch=`dpkg-architecture -q DEB_BUILD_ARCH`] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list
apt-get update
apt-get -y install --no-install-recommends docker-ce-cli
fi