Skip to content

Commit

Permalink
working on yaml to env. attribute encoding issues
Browse files Browse the repository at this point in the history
  • Loading branch information
dean-taylor committed Jun 7, 2018
1 parent cbcf979 commit 783610c
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 5 deletions.
15 changes: 10 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,17 @@ RUN pip install --no-cache-dir \
-r requirements-docs.txt \
-r requirements-test.txt
# from src/mytardis/package.json
RUN apt-get update && apt-get -y install \
npm \
# https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
&& apt-get update \
&& apt-get -y install \
nodejs \
&& apt-get clean
RUN npm install \
angular@1.3.2 \
angular-resource@1.3.2 \
ng-dialog@0.3.4
ng-dialog@0.3.4 \
&& apt-get -y remove nodejs

# UserWarning: The psycopg2 wheel package will be renamed from release 2.8
# <http://initd.org/psycopg/docs/install.html#binary-install-from-pypi>
Expand All @@ -73,10 +77,11 @@ RUN pip install --no-cache-dir \

# Bioformats
# https://github.com/keithschulze/mytardisbf
# openjdk-7-jdk \
RUN apt-get update && apt-get -y install \
openjdk-7-jdk \
openjdk-8-jdk \
&& apt-get clean
ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64
ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
RUN pip install -U --no-cache-dir \
numpy
RUN pip install --no-cache-dir -e git+https://github.com/keithschulze/mytardisbf.git@0.1.1#egg=mytardisbf
Expand Down
84 changes: 84 additions & 0 deletions k8s.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
---
kind: Deployment
apiVersion: apps/v1
metadata:
name: trudat
labels:
app: trudat
spec:
replicas: 1
selector:
matchLabels:
app: trudat
template:
metadata:
labels:
app: trudat
spec:
containers:
- name: django
image: uwaedu/mytardis_django:0.1.0
ports:
- containerPort: 8000
env:
- { name: "DJANGO_ADMINS", value: "[('Dean Taylor','dean.taylor@uwa.edu.au'),]" }
- { name: "DJANGO_ALLOWED_HOSTS", value: "'*'" }
- { name: "DJANGO_DATABASES_default_HOST", value: "localhost" }
- { name: "DJANGO_DATETIME_FORMAT", value: "jS F Y H:i" }
- { name: "DJANGO_DATE_FORMAT", value: "jS F Y" }
- { name: "DJANGO_DEBUG", value: "True" }
- { name: "DJANGO_DEFAULT_FROM_EMAIL", value: "donotreply-trudat@uwa.edu.au" }
- { name: "DJANGO_SECURE_PROXY_SSL_HEADER", value: "('HTTP_X_FORWARDED_PROTO', 'https')" }
- { name: "DJANGO_EMAIL_SUBJECT_PREFIX", value: "TruDat_UWA_Dev" }
- { name: "GUNICORN_WORKER_CLASS", value: "gevent" }
- { name: "MYTARDIS_BIOFORMATS_ENABLE", value: "True" }
- { name: "MYTARDIS_NIFCERT_ENABLE", value: "True" }
- { name: "MYTARDIS_SITE_TITLE", value: "TruDat@UWA_Dev" }
- { name: "MYTARDIS_RAPID_CONNECT_ENABLED", value: "False" }
- { name: "POSTGRES_PASSWORD", value: "password" }
- { name: "RABBITMQ_HOSTNAME", value: "localhost" }
- name: celery
image: uwaedu/mytardis_django:0.1.0
args: ["--loglevel=INFO","--autoreload"]
env:
- { name: "CELERY_ENABLE", value: "True" }
- { name: "DJANGO_DATABASES_default_HOST", value: "localhost" }
- { name: "MYTARDIS_BIOFORMATS_ENABLE", value: "True" }
- { name: "MYTARDIS_NIFCERT_ENABLE", value: "True" }
- { name: "POSTGRES_PASSWORD", value: "password" }
- { name: "RABBITMQ_HOSTNAME", value: "localhost" }
- name: beat
image: uwaedu/mytardis_django:0.1.0
args: ["--loglevel=INFO"]
env:
- { name: "CELERY_ENABLE", value: "beat" }
- { name: "DJANGO_DATABASES_default_HOST", value: "localhost" }
- { name: "MYTARDIS_BIOFORMATS_ENABLE", value: "False" }
- { name: "MYTARDIS_NIFCERT_ENABLE", value: "Fale" }
- { name: "POSTGRES_PASSWORD", value: "password" }
- { name: "RABBITMQ_HOSTNAME", value: "localhost" }
- name: other
image: uwaedu/mytardis_django:0.1.0
command: ["tail"]
args: ["-f","/dev/null"]
env:
- { name: "GUNICORN_ENABLE", value: "False" }
- name: db
image: postgres
env:
- { name: "POSTGRES_PASSWORD", value: "password" }
- name: rabbitmq
image: rabbitmq:3
---
kind: Service
apiVersion: v1
metadata:
name: trudat-service
spec:
selector:
app: trudat
ports:
- protocol: TCP
port: 8000
targetPort: 8000
type: LoadBalancer

0 comments on commit 783610c

Please sign in to comment.