[taler-deployment] branch master updated: Conversion format from Bash to Docker: www.git - Isolated

[gnunet]

This is an automated email from the git hooks/post-receive script.

javier-sepulveda pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new 0e7ddc0  Conversion format from Bash to Docker: www.git - Isolated
0e7ddc0 is described below

commit 0e7ddc0eeb1876b8a0ec455710ecb581d5f1facb
Author: Javier Sepulveda <javier.sepulveda@uv.es>
AuthorDate: Wed Feb 1 14:14:13 2023 +0100

    Conversion format from Bash to Docker: www.git - Isolated
---
 docker/sites-build/Dockerfile       | 46 ++++++++++++++++++++++++++++---------
 docker/sites-build/build-sites.sh   |  5 ----
 docker/sites-build/build.sh         |  4 ++--
 docker/sites-build/requirements.txt |  3 ---
 docker/sites-build/run.sh           |  5 ++--
 5 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/docker/sites-build/Dockerfile b/docker/sites-build/Dockerfile
index 99bdb42..8c541b5 100644
--- a/docker/sites-build/Dockerfile
+++ b/docker/sites-build/Dockerfile
@@ -1,24 +1,48 @@
-FROM python:alpine
+FROM debian:bookworm-slim
 
-# Dependencies
+# Install dependencies
 
-COPY requirements.txt /
+RUN apt update
 
-RUN pip install -r requirements.txt
+RUN apt install --no-install-recommends -y ca-certificates git make 
python3-pip gettext
 
-# Install GIT
+RUN pip install Jinja2 ruamel.yaml Babel beautifulsoup4 lxml
 
-RUN apk add git
+# User and folder
 
-# Create the user
-
-RUN adduser taler-websites --disabled-password
+RUN useradd -m taler-websites
 
 USER taler-websites
 
 WORKDIR /home/taler-websites
 
-# Execute when container run
+# Get the bash files which do the sites' compilation - step 1
+
+RUN git clone https://git.taler.net/deployment.git
+
+# Get the compilation Make files - step 2
+
+RUN git clone https://git.taler.net/www.git
+
+# Get twister code
+
+RUN git clone https://git.taler.net/twister.git
+
+# Get buywith code
+
+RUN git clone https://git.taler.net/buywith.git
+
+# Create needed directories requested by .sh files of step 1
+
+RUN mkdir buywith.taler.net stage.taler.net twister.taler.net stamps
+
+# Copy needed files to stamps directory
+
+RUN cp ~/deployment/taler-sitesbuild/invalidate.sh ~/stamps \
+ && cp ~/deployment/taler-sitesbuild/Makefile ~/stamps
+
+WORKDIR deployment/buildbot
 
-ENTRYPOINT ./deployment/docker/sites-build/build-sites.sh
+# Compile Taler websites 
 
+ENTRYPOINT ["./build-sites.sh"]
diff --git a/docker/sites-build/build-sites.sh 
b/docker/sites-build/build-sites.sh
deleted file mode 100755
index d1c1696..0000000
--- a/docker/sites-build/build-sites.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -eu
-cd $HOME/stamps
-./invalidate.sh
-make -k
diff --git a/docker/sites-build/build.sh b/docker/sites-build/build.sh
index 43f2e71..41e8dfd 100755
--- a/docker/sites-build/build.sh
+++ b/docker/sites-build/build.sh
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/bash
 
-docker build . -t sites-builder-image
+docker build . -t docker_image_taler_websites
\ No newline at end of file
diff --git a/docker/sites-build/requirements.txt 
b/docker/sites-build/requirements.txt
deleted file mode 100644
index 59f9b87..0000000
--- a/docker/sites-build/requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Jinja2
-ruamel.yaml
-Babel
diff --git a/docker/sites-build/run.sh b/docker/sites-build/run.sh
index 5478617..37d1a79 100755
--- a/docker/sites-build/run.sh
+++ b/docker/sites-build/run.sh
@@ -1,7 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
 # Execute  "Docker: sites-builer-image"
 
-docker run -v $HOME:/home/taler-websites sites-builder-image
-
 
+docker run -v $HOME/taler-websites:/home/taler-websites 
docker_image_taler_websites

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.