diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..58b5d82 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,4 @@ +Dockerfile* +db.sqlite3 +venv +k8s/ diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index ae34ac1..0000000 --- a/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM python:3.10.0 - -WORKDIR /usr/src/app - -COPY requirements.txt ./ -# OS requirements for building wheel and for operating uncloud -RUN apt-get update && apt-get install -y --no-install-recommends \ - git \ - libldap-dev \ - libxml2-dev \ - libxslt-dev \ - libpq-dev \ - libsasl2-dev \ - wireguard-tools -RUN pip install --no-cache-dir -r requirements.txt - -COPY . . diff --git a/Dockerfile b/Dockerfile new file mode 120000 index 0000000..87556cb --- /dev/null +++ b/Dockerfile @@ -0,0 +1 @@ +Dockerfile.alpine-linux \ No newline at end of file diff --git a/Dockerfile.debian b/Dockerfile.debian new file mode 100644 index 0000000..ae34ac1 --- /dev/null +++ b/Dockerfile.debian @@ -0,0 +1,17 @@ +FROM python:3.10.0 + +WORKDIR /usr/src/app + +COPY requirements.txt ./ +# OS requirements for building wheel and for operating uncloud +RUN apt-get update && apt-get install -y --no-install-recommends \ + git \ + libldap-dev \ + libxml2-dev \ + libxslt-dev \ + libpq-dev \ + libsasl2-dev \ + wireguard-tools +RUN pip install --no-cache-dir -r requirements.txt + +COPY . . diff --git a/build.sh b/build.sh index 2c51820..1e7f492 100755 --- a/build.sh +++ b/build.sh @@ -14,8 +14,14 @@ fi case "$target" in dev) - docker tag $name harbor.default.svc.c2.k8s.ooo/ungleich-public/${name} - docker push harbor.default.svc.c2.k8s.ooo/ungleich-public/${name} + url=harbor.default.svc.c2.k8s.ooo/ungleich-public + docker tag $name ${url}/${name} + docker push ${url}/${name} + ;; + prod) + url=harbor.ungleich.svc.p10.k8s.ooo/ungleich-public + docker tag $name ${url}/${name} + docker push ${url}/${name} ;; "") echo "Not pushing anywhere" diff --git a/uncloud/.dockerignore b/uncloud/.dockerignore new file mode 100644 index 0000000..32eda49 --- /dev/null +++ b/uncloud/.dockerignore @@ -0,0 +1,3 @@ +local_settings.py +ldap_max_uid_file +.env