Skip to content

Commit 4cd4233

Browse files
committed
print version, link swift to swiftly path for startup consistency
1 parent 378419d commit 4cd4233

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ RUN tar zxf swiftly.tar.gz && \
4545
hash -r \
4646
RUN echo 'source /root/.local/share/swiftly/env.sh' >> /root/.bashrc
4747
RUN /root/.local/share/swiftly/bin/swift --version
48+
RUN ln -s /root/.local/share/swiftly/bin/swift /usr/bin/swift
4849

4950

5051
WORKDIR /build

scripts/entrypoint.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
echo "Swift Codeserver"
44
echo "Based on coder/code-server: https://github.com/coder/code-server"
55
echo "-----------------------------------------------------------------------------------"
6-
echo "For Uitsmijter - Swift ${SWIFT_VERSION}"
6+
VERSION=$(swift --version || echo ${SWIFT_VERSION})
7+
echo "For Uitsmijter - Swift ${VERSION}"
78
echo ""
89
echo "Setup system"
910
echo ${MAX_USER_INSTANCES} > /proc/sys/fs/inotify/max_user_instances

tests/docker-compose.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '3.7'
2-
31
x-shared_environment: &shared_environment
42
SWIFT_VERSION: "${SWIFT_VERSION}"
53
COMMAND:

0 commit comments

Comments
 (0)