Skip to content

Commit 6c45060

Browse files
committed
tidy Dockerfile
1 parent b2ef8d8 commit 6c45060

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

Dockerfile

+7-9
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ FROM lubien/tired-proxy:2 as proxy
22
FROM hexpm/elixir:1.12.3-erlang-24.1.4-debian-bullseye-20210902-slim
33

44
# install build dependencies
5-
RUN apt-get update -y && apt-get install -y build-essential git \
5+
RUN apt-get update -y \
6+
&& apt-get install -y build-essential git unzip curl \
67
&& apt-get clean && rm -f /var/lib/apt/lists/*_* \
7-
&& apt update \
8-
&& apt install curl --yes \
9-
&& apt-get install unzip -y \
108
&& curl -fsSL https://code-server.dev/install.sh | sh
119

1210
# prepare build dir
@@ -15,17 +13,17 @@ WORKDIR /app
1513
# Use bash shell
1614
ENV SHELL=/bin/bash
1715

16+
RUN curl -L https://fly.io/install.sh | sh \
17+
&& echo 'export FLYCTL_INSTALL="/root/.fly"' >> ~/.bashrc \
18+
&& echo 'export PATH="$FLYCTL_INSTALL/bin:$PATH"' >> ~/.bashrc \
19+
&& code-server --install-extension elixir-lsp.elixir-ls
20+
1821
# Apply VS Code settings
1922
COPY settings.json /root/.local/share/code-server/User/settings.json
2023

2124
# Use our custom entrypoint script first
2225
COPY entrypoint.sh /entrypoint.sh
2326

24-
RUN curl -L https://fly.io/install.sh | sh \
25-
&& echo 'export FLYCTL_INSTALL="/root/.fly"' >> ~/.bashrc \
26-
&& echo 'export PATH="$FLYCTL_INSTALL/bin:$PATH"' >> ~/.bashrc \
27-
&& code-server --install-extension elixir-lsp.elixir-ls
28-
2927
COPY --from=proxy /tired-proxy /tired-proxy
3028

3129
ENTRYPOINT ["/entrypoint.sh"]

0 commit comments

Comments
 (0)