(critical-fix) Fix Dockerfile entrypoint.sh
Dockerfile changes to support Go broke the resulting image by omitting entrypoint.sh. This updates the Dockerfile to include entrypoint.sh and set working directory correctly. - Add the 'run_drydock' make target to the omni test so that the Dockerfile image build is gated Change-Id: I4c3ee7fd3acb037940e17997b47fff94e0e7fc6f
This commit is contained in:
parent
d3eee98e98
commit
472fc0f232
|
@ -43,16 +43,20 @@ RUN pip3 install \
|
||||||
--no-cache-dir \
|
--no-cache-dir \
|
||||||
-r /tmp/drydock/requirements-lock.txt
|
-r /tmp/drydock/requirements-lock.txt
|
||||||
|
|
||||||
COPY ./alembic /tmp/drydock/alembic
|
|
||||||
COPY ./alembic.ini /tmp/drydock/alembic.ini
|
|
||||||
COPY ./python /tmp/drydock/python
|
COPY ./python /tmp/drydock/python
|
||||||
COPY ${BUILD_DIR}/baclient /tmp/drydock/python/drydock_provisioner/assets/baclient
|
|
||||||
|
|
||||||
WORKDIR /tmp/drydock/python
|
WORKDIR /tmp/drydock/python
|
||||||
RUN python3 setup.py install
|
RUN python3 setup.py install
|
||||||
|
|
||||||
|
COPY ./alembic /tmp/drydock/alembic
|
||||||
|
COPY ./alembic.ini /tmp/drydock/alembic.ini
|
||||||
|
COPY ./entrypoint.sh /tmp/drydock/entrypoint.sh
|
||||||
|
|
||||||
|
COPY ${BUILD_DIR}/baclient /tmp/drydock/python/drydock_provisioner/assets/baclient
|
||||||
|
|
||||||
|
|
||||||
EXPOSE $PORT
|
EXPOSE $PORT
|
||||||
|
|
||||||
ENTRYPOINT ["./entrypoint.sh"]
|
WORKDIR /tmp/drydock
|
||||||
|
|
||||||
|
ENTRYPOINT ["./entrypoint.sh"]
|
||||||
CMD ["server"]
|
CMD ["server"]
|
||||||
|
|
|
@ -40,4 +40,15 @@
|
||||||
chdir: "{{ zuul.project.src_dir }}"
|
chdir: "{{ zuul.project.src_dir }}"
|
||||||
target: unit_tests
|
target: unit_tests
|
||||||
register: result
|
register: result
|
||||||
|
- name: Execute Go tests for baclient
|
||||||
|
make:
|
||||||
|
chdir: "{{ zuul.project.src_dir }}"
|
||||||
|
target: test_baclient
|
||||||
|
become: true
|
||||||
|
register: result
|
||||||
|
- name: Execute the make target for building and running the Drydock Docker image
|
||||||
|
make:
|
||||||
|
chdir: "{{ zuul.project.src_dir }}"
|
||||||
|
target: run_drydock
|
||||||
|
register: result
|
||||||
|
become: true
|
||||||
|
|
Loading…
Reference in New Issue