baha/skyline-apiserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Set stable-2024.1 version of skyline-console to use

Browse Source 
1. Use version of stable-2024.1 for skyline-console package
2. Set docker image tag as 2024.1

Change-Id: Ifedbefe00f6f7d52393fef507f31ddcaf1d122b9
This commit is contained in:
zhuboxiang 2024-07-02 14:02:18 +08:00
parent c7195d5bcb
commit 9b85645aab
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -17,7 +17,7 @@ GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
GIT_COMMIT ?= $(shell git rev-parse --verify HEAD) GIT_COMMIT ?= $(shell git rev-parse --verify HEAD)
# URL for skyline-console packages # URL for skyline-console packages
SKYLINE_CONSOLE_PACKAGE_URL ?= "https://tarballs.opendev.org/openstack/skyline-console/skyline-console-master.tar.gz" SKYLINE_CONSOLE_PACKAGE_URL ?= "https://tarballs.opendev.org/openstack/skyline-console/skyline-console-stable-2024.1.tar.gz"
.PHONY: help .PHONY: help
@ -81,7 +81,7 @@ BUILD_ENGINE ?= docker
BUILD_CONTEXT ?= . BUILD_CONTEXT ?= .
DOCKER_FILE ?= container/Dockerfile DOCKER_FILE ?= container/Dockerfile
IMAGE ?= skyline IMAGE ?= skyline
IMAGE_TAG ?= latest IMAGE_TAG ?= 2024.1
ifeq ($(BUILD_ENGINE), docker) ifeq ($(BUILD_ENGINE), docker)
build_cmd = docker build build_cmd = docker build
else ifeq ($(BUILD_ENGINE), buildah) else ifeq ($(BUILD_ENGINE), buildah)

4
container/Dockerfile
View File

@ -25,12 +25,12 @@ RUN pip install -U /opt/skyline_apiserver/skyline_console/skyline_console.tar.gz
COPY ./requirements.txt /opt/skyline_apiserver/requirements.txt COPY ./requirements.txt /opt/skyline_apiserver/requirements.txt
RUN pip install -r /opt/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/2024.1
COPY ./ /opt/skyline_apiserver/ COPY ./ /opt/skyline_apiserver/
RUN git init /opt/skyline_apiserver \ RUN git init /opt/skyline_apiserver \
&& pip install /opt/skyline_apiserver -chttps://releases.openstack.org/constraints/upper/master \ && pip install /opt/skyline_apiserver -chttps://releases.openstack.org/constraints/upper/2024.1 \
&& apt-get clean \ && apt-get clean \
&& rm -rf ~/.cache/pip \ && rm -rf ~/.cache/pip \
&& mkdir -p /etc/skyline /var/log/skyline /var/lib/skyline && mkdir -p /etc/skyline /var/log/skyline /var/lib/skyline