Compare commits
8
Commits
94e47be079
...
1adc0ffc4a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1adc0ffc4a | ||
|
|
b123e260b0 | ||
|
|
aa6ce119b8 | ||
|
|
87d8c52c48 | ||
|
|
2661593e69 | ||
|
|
7cb3d1917e | ||
|
|
d556284977 | ||
|
|
d90696a1a5 |
@@ -83,7 +83,8 @@ jobs:
|
|||||||
- name: Build and push
|
- name: Build and push
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
context: infra/production/
|
context: .
|
||||||
|
file: infra/production/dockerfile
|
||||||
push: true
|
push: true
|
||||||
build-args: |
|
build-args: |
|
||||||
ALLOWED_HOSTS='django.tryton.geeraert.eu'
|
ALLOWED_HOSTS='django.tryton.geeraert.eu'
|
||||||
|
|||||||
@@ -46,7 +46,8 @@ jobs:
|
|||||||
- name: Build and push
|
- name: Build and push
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
context: infra/testing/
|
context: .
|
||||||
|
file: infra/testing/dockerfile
|
||||||
push: true
|
push: true
|
||||||
build-args: |
|
build-args: |
|
||||||
ALLOWED_HOSTS='django-testing.tryton.geeraert.eu'
|
ALLOWED_HOSTS='django-testing.tryton.geeraert.eu'
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ MIDDLEWARE = [
|
|||||||
'django.contrib.messages.middleware.MessageMiddleware',
|
'django.contrib.messages.middleware.MessageMiddleware',
|
||||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||||
'django_hosts.middleware.HostsResponseMiddleware',
|
'django_hosts.middleware.HostsResponseMiddleware',
|
||||||
|
"whitenoise.middleware.WhiteNoiseMiddleware",
|
||||||
]
|
]
|
||||||
|
|
||||||
ROOT_URLCONF = 'core.urls'
|
ROOT_URLCONF = 'core.urls'
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ WORKDIR /code/
|
|||||||
COPY requirements.txt ./
|
COPY requirements.txt ./
|
||||||
|
|
||||||
|
|
||||||
RUN pip install --cache-dir=/opt/hostedtoolcache/pip --upgrade pip
|
RUN pip install --cache-dir=/opt/hostedtoolcache/pip --upgrade pip
|
||||||
RUN pip list --cache-dir=/opt/hostedtoolcache/pip --outdated
|
RUN pip list --cache-dir=/opt/hostedtoolcache/pip --outdated
|
||||||
RUN pip install --cache-dir=/opt/hostedtoolcache/pip --upgrade wheel
|
RUN pip install --cache-dir=/opt/hostedtoolcache/pip --upgrade wheel
|
||||||
RUN pip install --cache-dir=/opt/hostedtoolcache/pip --upgrade setuptools
|
RUN pip install --cache-dir=/opt/hostedtoolcache/pip --upgrade setuptools
|
||||||
@@ -24,7 +24,7 @@ RUN pip install --cache-dir=/opt/hostedtoolcache/pip -r requirements.txt
|
|||||||
# Copy the rest of your application code (Changes frequently, invalidates subsequent cache)
|
# Copy the rest of your application code (Changes frequently, invalidates subsequent cache)
|
||||||
COPY . ./
|
COPY . ./
|
||||||
|
|
||||||
COPY entrypoint.sh /code/entrypoint.sh
|
COPY infra/production/entrypoint.sh /code/entrypoint.sh
|
||||||
RUN chmod +x /code/entrypoint.sh
|
RUN chmod +x /code/entrypoint.sh
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -17,3 +17,4 @@ django-hosts
|
|||||||
django-import-export
|
django-import-export
|
||||||
bitwarden_sdk
|
bitwarden_sdk
|
||||||
xmltodict
|
xmltodict
|
||||||
|
whitenoise
|
||||||
Reference in New Issue
Block a user