Commit Graph

24 Commits

Author SHA1 Message Date
Florian Haftmann
9c58aef47c refactor: Prefer FHS-conformant location
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
2024-01-24 13:03:13 +01:00
Florian Haftmann
73cef61356 feat: Cached download of Skyline Console tarball
The tarball is downloaded only once, changes to the sources do not
result in a re-download.

Change-Id: I80ad7ed0a849f639bd4e0655ba6307c09f56814c
2024-01-24 13:03:13 +01:00
Florian Haftmann
aef1139897 style: Uniform order of arguments, shorter lines
Explicit line breaks make passed arguments clear.

Change-Id: I6ef3b7b52634bca05de63033b0baed2163a65ce9
2024-01-24 13:03:13 +01:00
Florian Haftmann
4546837e14 refactor: Prefer separate LABEL instructions
LABELs can go to separate directives, which does not induce a penalty
on the image since docker 1.10.

See also https://dockerlabs.collabnix.com/beginners/dockerfile/Label_instruction.html

Change-Id: Iac33480bc3f4069ab904279ad61b5c58746318c0
2023-12-01 14:02:00 +01:00
Florian Haftmann
bec6c457e5 feat: Install requirements in separate step
Pre-installing the requirements avoids that a mere change of sources
triggers a re-download during incremental docker build.

Change-Id: I734e5d48866aea1b154c467536aaec751cb1740c
2023-12-01 14:02:00 +01:00
Florian Haftmann
8c5bdbe569 feat: Base installation independent of sources
With the aim of incremental development builds, a mere change
of the sources should not result in a re-download of a
substantial amount of distribution packages, including a potential
later re-upload into a container registry.

Change-Id: Ica516f2a40ffaae9ddf4d7dd51d466e23456154f
2023-12-01 14:01:38 +01:00
Florian Haftmann
9e9b76b991 refactor: Official solution for python(3) tools
The re-wiring from python to python3 does not need any manual low-level intervention
but can use official packages.

Change-Id: Idf08a85dd8060d1496802eeca04fb2ca470f6712
2023-12-01 09:02:14 +01:00
Florian Haftmann
f4f081c625 refactor: Tuned
The command git init optionally accepts an explicit working directory,
no need to cd.

Change-Id: I5703b86836170480a6873fd7da85626fa330c85a
2023-12-01 09:02:14 +01:00
Florian Haftmann
70d4677e54 refactor: Dropped redundant environment setting
With LANG set by ENV pervasively, it would be redundant to set
it again for the RUN command line.

Change-Id: Ia9f7d4cf81a268a9db238aa3cec1a9c1029f541f
2023-12-01 09:02:14 +01:00
Boxiang Zhu
1393aea120 feat: Support both http and https for nginx.conf.j2 template
By default, if we do not supply the ssl_certfile and ssl_keyfile,
nginx will use http.

Change-Id: Iba86cd119e1aeec892c2b663c994778b63767e3e
2022-10-21 14:59:23 +08:00
Boxiang Zhu
1edaacf735 fix: Use constraints file when build skyline image
We follow the constraints file of openstack constraints when
we build the skyline docker image.

Change-Id: I53ca823da45d56dd7a1b673cf3a0eda24467f39d
2022-10-19 13:39:21 +08:00
yangshaoxue
068cf9c526 Add skyline port settings
1. skyline port can be set when skyline container starts
2. update readme

Change-Id: Ic7f81e3d753c041fd5ea89268855d4b68086807d
2022-06-23 14:44:23 +08:00
zhu.boxiang
1a050ec2c4 chore: Remove poetry
1. remove poetry dependency
2. add requirements.tx, test-requirements.txt, setup.py and setup.cfg
3. add more env into tox.ini
4. remove some command from Makefile
5. cleanup the dependencies
6. change some commands of README
7. update the devstack

Depends-On: https://review.opendev.org/c/openstack/skyline-console/+/843257

Change-Id: I4cefc4cfdaadf7b3ba03ffe8441e9ae760772349
2022-05-25 22:26:42 +08:00
chenliufeiyang
9aa12defca feature: Add skyline-console commit-id
1. add wget and tar into makefile to get skyline-console package
2. set skyline-console commit into skyline docker image as label

Depends-On: https://review.opendev.org/c/openstack/skyline-console/+/841664
Change-Id: Id69ba06c91343ca6bdccab85c45d258a3a6eaa19
2022-05-20 14:14:21 +08:00
zhu.boxiang
8cb60f0833 chore: Move skyline_apiserver out of libs
1. move skyline_apiserver out of libs
2. remove libs folder
3. remove old skyline folder
4. adjust zull, devstack and dockerfile

Change-Id: I27a4babd3df077d1dfc7555f67a6ea618d4b2966
2022-05-18 17:21:00 +08:00
zhu.boxiang
9312010923 chore: Merge skyline-nginx into skyline-apiserver
1. merge skyline-nginx into skyline-apiserver

Change-Id: Ib2f31435ce69c52ea2c27d63177f9c8f936c033e
2022-05-16 21:38:38 +08:00
zhu.boxiang
1ab2cec63b fix: Use -U to upgrade the skyline-console with tarball
Use -U to upgrade the skyline-console with tarball when
building the skyline container.

Change-Id: I494ee49e8ce5983823388c60124364e0a7064f36
2022-04-23 12:01:55 +08:00
zhu.boxiang
6494ff6a46 fix: Fix the log_dir
If the log_dir is /var/log/kolla, and when we
deploy with devstack, we only chown the permission
for /var/log/kolla/skyline with stack user.
But the permission for /var/log/kolla is still root.
So it can not be access by stack user.
We will both change the log_dir in skyline-console
project.

Change-Id: I852c44cda2f9879aa8d8e405bb39bba13f35b8ca
2022-03-14 10:22:24 +08:00
yangshaoxue
babe6fe563 fix: Update .zuul.yaml
fix: Update .zuul.yaml
Change-Id: I8bc5bdefcfc56c0e91b2b6ff6125e6b9f9b44996
2022-03-10 19:10:57 +08:00
zhu.boxiang
047f197844 refactor: Remove skyline-console submodule
1. Remove libs/skyline-console submodule
2. Delete .gitmodules file
3. Update the dependencies
4. Update the Dockerfile

Change-Id: I80eae423ba3c308bb7f4d817f9142d9877855e7a
2022-01-06 13:43:46 +08:00
zhu.boxiang
27d22a984d fix: Error build image
Fail to build skyline image. We should upgrade the pip and setuptools
version.

Remove irrelevant files for skyline-tox-lint-py38 job to retain one job
to trigger zuul.

Refer: https://github.com/python-poetry/poetry/issues/3329

Change-Id: I444faa3aefaa8ef8cfeb5284bc2a7a49bb0cb91b
2021-11-23 11:04:50 +08:00
Gao Hanxiang
3855a725a9 fix: Fix make build failed
Since poetry 1.1.8 version introduces a large number of bugs[1], which
makes the process of building container image fail, so the 1.1.8
version of poetry is not used.

[1] https://github.com/python-poetry/poetry/issues/4429

Change-Id: Ia30c2c5e783401aa4bad85139b0bf2fa9a822847
2021-08-25 04:54:43 -04:00
Gao Hanxiang
a0701711be feat: Add bootstrap support for skyline image
When docker run, specify the KOLLA_BOOSTRAP environment variable, the
skyline image will initialize the database, and if it is not specified,
the skyline service will be run in the normal way.
This provides the basis for subsequent docking with kolla-ansible.

Change-Id: I5eaad038b3ed3c3189f2b41e41c14d28a346ee88
2021-07-26 11:01:31 -04:00
Gao Hanxiang
ee84ba0b8f feat: Add make build
1. Add dockerfile
2. Modify gunicorn config

Change-Id: I99d233908b3f21e5e0a4cd739ee7702839a8fb46
2021-07-26 03:51:01 +00:00