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

feature: Add skyline-console commit-id

Browse Source 
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
This commit is contained in:
chenliufeiyang 2022-05-20 10:04:38 +08:00 committed by zhu.boxiang
parent 8cb60f0833
commit 9aa12defca
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -71,6 +71,7 @@ venv.bak/
/log/ /log/
tmp/ tmp/
test_results.html test_results.html
skyline-console-*
# MAC OS # MAC OS
.DS_Store .DS_Store

4
Makefile
View File

@ -128,7 +128,9 @@ else
$(error Unsupported build engine $(BUILD_ENGINE)) $(error Unsupported build engine $(BUILD_ENGINE))
endif endif
build: build:
$(build_cmd) --no-cache --pull --force-rm --build-arg RELEASE_VERSION=$(RELEASE_VERSION) --build-arg SKYLINE_CONSOLE_PACKAGE_URL=$(SKYLINE_CONSOLE_PACKAGE_URL) --build-arg GIT_BRANCH=$(GIT_BRANCH) --build-arg GIT_COMMIT=$(GIT_COMMIT) $(BUILD_ARGS) -f $(DOCKER_FILE) -t $(IMAGE):$(IMAGE_TAG) $(BUILD_CONTEXT) GIT_CONSOLE_COMMIT=$(shell wget $(SKYLINE_CONSOLE_PACKAGE_URL) && tar -zxf skyline-console-master.tar.gz && cat skyline-console-0.1.0/skyline_console/static/commit_id.txt); \
$(build_cmd) --no-cache --pull --force-rm --build-arg RELEASE_VERSION=$(RELEASE_VERSION) --build-arg SKYLINE_CONSOLE_PACKAGE_URL=$(SKYLINE_CONSOLE_PACKAGE_URL) --build-arg GIT_BRANCH=$(GIT_BRANCH) --build-arg GIT_COMMIT=$(GIT_COMMIT) --build-arg GIT_CONSOLE_COMMIT=$$GIT_CONSOLE_COMMIT $(BUILD_ARGS) -f $(DOCKER_FILE) -t $(IMAGE):$(IMAGE_TAG) $(BUILD_CONTEXT)
rm -rf skyline-console-*
.PHONY: swagger .PHONY: swagger

2
container/Dockerfile
View File

@ -2,11 +2,13 @@ FROM ubuntu:20.04
ARG GIT_BRANCH ARG GIT_BRANCH
ARG GIT_COMMIT ARG GIT_COMMIT
ARG GIT_CONSOLE_COMMIT
ARG RELEASE_VERSION ARG RELEASE_VERSION
ARG SKYLINE_CONSOLE_PACKAGE_URL ARG SKYLINE_CONSOLE_PACKAGE_URL
LABEL skyline.build_branch=${GIT_BRANCH}\ LABEL skyline.build_branch=${GIT_BRANCH}\
skyline.build_commit=${GIT_COMMIT} \ skyline.build_commit=${GIT_COMMIT} \
skyline.build_console_commit=${GIT_CONSOLE_COMMIT} \
skyline.release_version=${RELEASE_VERSION} skyline.release_version=${RELEASE_VERSION}
ENV LANG C.UTF-8 ENV LANG C.UTF-8