Skip to content

Commit 223490a

Browse files
committed
Back to release
1 parent 8060022 commit 223490a

File tree

3 files changed

+22
-25
lines changed

3 files changed

+22
-25
lines changed

.github/workflows/dockerise.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ jobs:
5252
path: client/packages/host/dist
5353

5454
- name: Build server
55-
run: docker run --rm --user "$(id -u)":"$(id -g)" -v "$PWD":/usr/src/omsupply -w /usr/src/omsupply/server rust:slim cargo build --bin remote_server --bin remote_server_cli
55+
run: docker run --rm --user "$(id -u)":"$(id -g)" -v "$PWD":/usr/src/omsupply -w /usr/src/omsupply/server rust:slim cargo build --release --bin remote_server --bin remote_server_cli
5656

5757
- name: Save artifacts
5858
uses: actions/upload-artifact@v4
5959
with:
6060
name: server-executables
6161
path: |
62-
server/target/debug/remote_server
63-
server/target/debug/remote_server_cli
62+
server/target/release/remote_server
63+
server/target/release/remote_server_cli
6464
retention-days: 1
6565

6666
dockerise:
@@ -76,7 +76,7 @@ jobs:
7676
uses: actions/download-artifact@v4
7777
with:
7878
name: server-executables
79-
path: server/target/debug/
79+
path: server/target/release/
8080

8181
- name: Set up Docker Buildx
8282
uses: docker/setup-buildx-action@v3

Dockerfile

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
11

22
FROM rust:slim
33

4-
RUN apt-get update && apt-get install -y faketime
4+
RUN apt-get update && apt-get install git make
5+
6+
# Install faketime
7+
WORKDIR /usr/src/
8+
RUN git clone https://github.com/wolfcw/libfaketime.git
9+
WORKDIR /usr/src/libfaketime/src
10+
RUN make install
11+
# This will make libfaketime.so.1 run when time is requested form the system
12+
# making FAKETIME env variable work
13+
RUN echo "/usr/src/libfaketime/src/libfaketime.so.1" > /etc/ld.so.preload
514

615
WORKDIR /usr/src/omsupply/server
716
# Copy executable
8-
COPY server/target/debug/remote_server .
9-
COPY server/target/debug/remote_server_cli .
17+
COPY server/target/release/remote_server .
18+
COPY server/target/release/remote_server_cli .
1019
# Copy entry
1120
COPY docker/entry.sh .
1221
# Copy reference file

docker/entry.sh

+6-18
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,10 @@ if [ ! -z "$LOAD_REFERENCE_FILE" ]; then
1717
MSUPPLY_NO_TEST_DB_TEMPLATE=1 ./remote_server_cli initialise-from-export -n "$LOAD_REFERENCE_FILE"
1818
fi
1919

20+
# Refresh dates
21+
if [ "$SHOULD_REFRESH_DATES" = true ]; then
22+
echo "Refreshing dates"
23+
./remote_server_cli refresh-dates
24+
fi
2025

21-
# Run the remote_server with or without faketime
22-
if [ ! -z "$FAKE_DATETIME" ]; then
23-
# Refresh dates
24-
if [ "$SHOULD_REFRESH_DATES" = true ]; then
25-
echo "Refreshing dates"
26-
faketime "$FAKE_DATETIME" ./remote_server_cli refresh-dates
27-
fi
28-
echo "Starting remote_server with faketime: $FAKE_DATETIME"
29-
exec faketime "$FAKE_DATETIME" ./remote_server
30-
else
31-
# Refresh dates
32-
if [ "$SHOULD_REFRESH_DATES" = true ]; then
33-
echo "Refreshing dates"
34-
./remote_server_cli refresh-dates
35-
fi
36-
echo "Starting remote_server normally"
37-
exec ./remote_server
38-
fi
26+
exec ./remote_server

0 commit comments

Comments
 (0)