Skip to content

Commit 8f279d8

Browse files
committed
update
1 parent 5b5eb2c commit 8f279d8

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

docker-compose.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@
1919

2020
services:
2121
msc-wis2node-cache:
22-
image: memcached
22+
image: memcached:latest
2323
container_name: msc-wis2node-cache
2424
env_file:
2525
- msc-wis2node.env
26-
msc-wis2node:
26+
msc-wis2node-management:
27+
image: msc-wis2node-management
2728
container_name: msc-wis2node
2829
build:
29-
context: msc-wis2node-management
30+
context: msc-wis2node-management/
3031
env_file:
3132
- msc-wis2node.env
3233
volumes:

msc-wis2node-management/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ RUN apt-get update -y && \
4747
adduser msc-wis2node sudo && \
4848
echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers && \
4949
# install sr3 components
50-
mkdir -p $SR3_CONFIG/plugins && \
51-
mkdir -p $SR3_CONFIG/subscribe && \
52-
cp msc_wis2node/publisher.py $SR3_CONFIG/plugins && \
53-
cp deploy/default/sarracenia/dd.weather.gc.ca-all.conf $SR3_CONFIG/subscribe
50+
mkdir -p /home/msc-wis2node/.config/sr3/plugins && \
51+
mkdir -p /home/msc-wis2node/.config/sr3/subscribe && \
52+
cp msc_wis2node/publisher.py /home/msc-wis2node/.config/sr3/plugins/publisher.py && \
53+
cp deploy/default/sarracenia/dd.weather.gc.ca-all.conf /home/msc-wis2node/.config/sr3/subscribe/dd.weather.gc.ca-all.conf
5454

5555
USER msc-wis2node
5656
WORKDIR /home/msc-wis2node

msc-wis2node-management/docker/entrypoint.sh

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/bin/bash
12
###############################################################################
23
#
34
# Copyright (C) 2025 Tom Kralidis
@@ -19,10 +20,12 @@
1920

2021
echo "START /entrypoint.sh"
2122

22-
set +e
23+
printenv | grep -v "no_proxy" > /tmp/environment
24+
sudo sh -c 'cat /tmp/environment >> /etc/environment'
25+
rm -f /tmp/environment
2326

2427
echo "starting sr3..."
2528

26-
sr3 --logStdout --debug foreground subscribe/dd.weather.gc.ca-all && sleep infinity
29+
sr3 --logStdout start subscribe/dd.weather.gc.ca-all && sleep infinity
2730

2831
echo "END /entrypoint.sh"

0 commit comments

Comments
 (0)