From 6ca9abfd878807924b1b17a0fc1af8e8a43abd2b Mon Sep 17 00:00:00 2001 From: Thibaut CORDIER Date: Wed, 19 Feb 2025 13:20:43 +0100 Subject: [PATCH 1/4] Create Docker-RSE-500 Signed-off-by: Thibaut CORDIER --- cli/alpine-minimal/Docker-RSE-500 | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 cli/alpine-minimal/Docker-RSE-500 diff --git a/cli/alpine-minimal/Docker-RSE-500 b/cli/alpine-minimal/Docker-RSE-500 new file mode 100644 index 0000000..dc2e333 --- /dev/null +++ b/cli/alpine-minimal/Docker-RSE-500 @@ -0,0 +1,34 @@ +FROM alpine:latest + +USER root +ENV http_proxy=your-proxy +ENV https_proxy=your-proxy +ENV ZOWE_VERSION=8.9.0 +ENV RSE_VERSION=5.0.0 + +# Install Node, plugin prereqs +RUN sed -i 's/https/http/' /etc/apk/repositories +RUN apk update && apk upgrade && apk add curl doas nodejs npm libsecret dbus gnome-keyring dbus-x11 && rm -rf /var/cache/apk/* + +# Install Zowe CLI +RUN npm config set strict-ssl false +RUN npm install -g @zowe/cli@$ZOWE_VERSION --ignore-scripts +RUN zowe plugins install @ibm/rse-api-for-zowe-cli@$RSE_VERSION + +# Config profile RSE global +RUN zowe config init --global-config + +# démon DBUS cf https://github.com/zowe/zowe-cli/issues/1139 +RUN mkdir -p /var/run/dbus +RUN dbus-daemon --system +RUN dbus-launch --sh-syntax --exit-with-session +RUN export $(dbus-launch) + +# Copier le script de démarrage dans l'image +COPY start.sh /usr/local/bin/start.sh + +# Rendre le script exécutable +RUN chmod +x /usr/local/bin/start.sh + +# Définir le script de démarrage comme point d'entrée +ENTRYPOINT ["/usr/local/bin/start.sh"] From e46ca40fd166e7a10c42b4e82c81e648e684c6ae Mon Sep 17 00:00:00 2001 From: Thibaut CORDIER Date: Wed, 19 Feb 2025 13:35:20 +0100 Subject: [PATCH 2/4] Update Docker-RSE-500 Signed-off-by: Thibaut CORDIER --- cli/alpine-minimal/Docker-RSE-500 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cli/alpine-minimal/Docker-RSE-500 b/cli/alpine-minimal/Docker-RSE-500 index dc2e333..00988df 100644 --- a/cli/alpine-minimal/Docker-RSE-500 +++ b/cli/alpine-minimal/Docker-RSE-500 @@ -24,11 +24,13 @@ RUN dbus-daemon --system RUN dbus-launch --sh-syntax --exit-with-session RUN export $(dbus-launch) -# Copier le script de démarrage dans l'image -COPY start.sh /usr/local/bin/start.sh +# Create starting script +RUN echo '#!/bin/sh' > /usr/local/bin/start.sh \ + && echo 'export $(dbus-launch)' >> /usr/local/bin/start.sh \ + && echo 'exec "$@"' >> /usr/local/bin/start.sh -# Rendre le script exécutable +# set the script executable RUN chmod +x /usr/local/bin/start.sh -# Définir le script de démarrage comme point d'entrée +# set the script as entrypoint ENTRYPOINT ["/usr/local/bin/start.sh"] From 1061db3a9cfd6683907c1de0a017d34691ee8bd5 Mon Sep 17 00:00:00 2001 From: Thibaut CORDIER Date: Wed, 19 Feb 2025 13:38:22 +0100 Subject: [PATCH 3/4] Signed-off-by: Thibaut CORDIER Signed-off-by: Thibaut CORDIER --- cli/alpine-minimal/Docker-RSE-500 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/alpine-minimal/Docker-RSE-500 b/cli/alpine-minimal/Docker-RSE-500 index 00988df..6fbfa6f 100644 --- a/cli/alpine-minimal/Docker-RSE-500 +++ b/cli/alpine-minimal/Docker-RSE-500 @@ -24,7 +24,7 @@ RUN dbus-daemon --system RUN dbus-launch --sh-syntax --exit-with-session RUN export $(dbus-launch) -# Create starting script +# Create starting script RUN echo '#!/bin/sh' > /usr/local/bin/start.sh \ && echo 'export $(dbus-launch)' >> /usr/local/bin/start.sh \ && echo 'exec "$@"' >> /usr/local/bin/start.sh From 9df575b8ba6ddb4370e111ed4b40fdf2bb32552f Mon Sep 17 00:00:00 2001 From: Thibaut CORDIER Date: Wed, 19 Feb 2025 15:08:05 +0100 Subject: [PATCH 4/4] Signed-off-by: Thibaut CORDIER Signed-off-by: Thibaut CORDIER --- cli/alpine-minimal/Docker-RSE-500 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/cli/alpine-minimal/Docker-RSE-500 b/cli/alpine-minimal/Docker-RSE-500 index 6fbfa6f..7a2192a 100644 --- a/cli/alpine-minimal/Docker-RSE-500 +++ b/cli/alpine-minimal/Docker-RSE-500 @@ -1,19 +1,15 @@ FROM alpine:latest -USER root ENV http_proxy=your-proxy ENV https_proxy=your-proxy -ENV ZOWE_VERSION=8.9.0 -ENV RSE_VERSION=5.0.0 +ENV ZOWE_VERSION=zowe-v3-lts # Install Node, plugin prereqs -RUN sed -i 's/https/http/' /etc/apk/repositories RUN apk update && apk upgrade && apk add curl doas nodejs npm libsecret dbus gnome-keyring dbus-x11 && rm -rf /var/cache/apk/* # Install Zowe CLI -RUN npm config set strict-ssl false RUN npm install -g @zowe/cli@$ZOWE_VERSION --ignore-scripts -RUN zowe plugins install @ibm/rse-api-for-zowe-cli@$RSE_VERSION +RUN zowe plugins install @ibm/rse-api-for-zowe-cli # Config profile RSE global RUN zowe config init --global-config