Skip to content

R
red-ci-cd
Commit 9b27b1b7 authored by John Red Medrano's avatar John Red Medrano
Browse files
Options

conflict fixed

parents 3acde449 e6c001b7
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
Dockerfile
View file @ 9b27b1b7
...@@ -5,4 +5,4 @@ ADD . /code ...@@ -5,4 +5,4 @@ ADD . /code
COPY . /code COPY . /code
WORKDIR /code WORKDIR /code
RUN pip install -r requirements/local.txt RUN pip install -r requirements/local.txt
EXPOSE 9080 EXPOSE 7010
docker-compose.yml
View file @ 9b27b1b7
...@@ -18,4 +18,10 @@ networks: ...@@ -18,4 +18,10 @@ networks:
driver: bridge driver: bridge
ipam: ipam:
config: config:
- subnet: 172.168.70.0/16 <<<<<<< HEAD
\ No newline at end of file - subnet: 172.168.70.0/16
=======
- subnet: 172.168.70.0/16
>>>>>>> e6c001b78c8f9c9e6279ba90d72e5f86f7eea858
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment