openstack/skyline-apiserver
Code Issues Proposed changes

refactor: Prefer FHS-conformant location

Browse Source 
Formally using a FHS-conformant location clarifies that the files
are needed during runtime also.

See also https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html

Change-Id: I569b4248ff0ab6f075e526cf62a41cbf84fa2d08
This commit is contained in:
Florian Haftmann 2023-02-28 15:52:54 +01:00
parent 73cef61356
commit 9c58aef47c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
container/Dockerfile
View File

@ -19,18 +19,18 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends apt-utils \
gcc make nginx traceroute lsof iputils-ping vim git wget curl locales-all ssl-cert \
python3 python3-pip python3-dev python3-venv python-dev-is-python3
COPY ./skyline_console /var/cache/skyline_apiserver/skyline_console
COPY ./skyline_console /opt/skyline_apiserver/skyline_console
RUN pip install -U /var/cache/skyline_apiserver/skyline_console/skyline_console.tar.gz
RUN pip install -U /opt/skyline_apiserver/skyline_console/skyline_console.tar.gz
COPY ./requirements.txt /skyline-apiserver/requirements.txt
COPY ./requirements.txt /opt/skyline_apiserver/requirements.txt
RUN pip install -r skyline-apiserver/requirements.txt -chttps://releases.openstack.org/constraints/upper/master
RUN pip install -r /opt/skyline_apiserver/requirements.txt -chttps://releases.openstack.org/constraints/upper/master
COPY ./ /skyline-apiserver/
COPY ./ /opt/skyline_apiserver/
RUN git init /skyline-apiserver \
&& pip install skyline-apiserver/ -chttps://releases.openstack.org/constraints/upper/master \
RUN git init /opt/skyline_apiserver \
&& pip install /opt/skyline_apiserver -chttps://releases.openstack.org/constraints/upper/master \
&& apt-get clean \
&& rm -rf ~/.cache/pip \
&& mkdir -p /etc/skyline /var/log/skyline /var/lib/skyline

2
container/start_service.sh
View File

@ -8,7 +8,7 @@ mapfile -t CMD < <(tail /run_command | xargs -n 1)
# kolla_extend_start
if [[ "${!KOLLA_BOOTSTRAP[*]}" ]]; then
cd /skyline-apiserver/
cd /opt/skyline_apiserver/
make db_sync
exit 0
fi