[damned-lies/oscp] Use $* as we want to concatenate positional arguments together (but separe them with spaces)
- From: Andrea Veri <averi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [damned-lies/oscp] Use $* as we want to concatenate positional arguments together (but separe them with spaces)
- Date: Mon, 16 Sep 2019 09:35:39 +0000 (UTC)
commit 303b6ac5c0911fa831f31c2d04ecc9d5fc130eaa
Author: Andrea Veri <averi redhat com>
Date: Mon Sep 16 11:35:30 2019 +0200
Use $* as we want to concatenate positional arguments together (but separe them with spaces)
Dockerfile | 1 +
entrypoint.sh | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/Dockerfile b/Dockerfile
index 1963a119..8191dc54 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,3 +36,4 @@ RUN virtualenv /l10n/venv && \
ADD entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
+CMD ["httpd", "-DFOREGROUND"]
diff --git a/entrypoint.sh b/entrypoint.sh
index 7e0aa3f4..cb92b5db 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -15,4 +15,4 @@ wget https://gitlab.gnome.org/Infrastructure/damned-lies/raw/oscp/ssh_config -O
/l10n/venv/bin/python manage.py collectstatic
/l10n/venv/bin/python manage.py compile-trans
-scl enable rh-python36 httpd24 "httpd -DFOREGROUND"
+scl enable rh-python36 httpd24 "$*"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]