fix ci to use master (d5cf648a) · Commits · e / infra / spot

.gitlab-ci.yml

+5 −5

Original line number	Original line	Diff line number	Diff line
	image: $CI_REGISTRY_IMAGE/env:latest

	stages:		stages:
	- check		- check
	@@ -10,12 +9,14 @@ services:
	- docker:20.10-dind		- docker:20.10-dind

	python:		python:
			image: $CI_REGISTRY_IMAGE:master
	stage: check		stage: check
	script:		script:
	- ./manage test.black		- ./manage test.black
	- ./manage test.pylint		- ./manage test.pylint

	build:web:		build:web:
			image: $CI_REGISTRY_IMAGE:master
	stage: build		stage: build
	script:		script:
	- ./manage node.env		- ./manage node.env
	@@ -30,25 +31,24 @@ build:web:
	before_script:		before_script:
	- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY		- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
	script:		script:
	- docker pull $CI_REGISTRY_IMAGE/env
	- docker tag $CI_REGISTRY_IMAGE/env base-env-image
	- docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .		- docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
	- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG		- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG

	build:docker:		build:docker:
	extends: .build:docker		extends: .build:docker
			only:
			- branches

	build:docker:tags:		build:docker:tags:
	extends: .build:docker		extends: .build:docker
	script:		script:
	- docker pull $CI_REGISTRY_IMAGE/env
	- docker tag $CI_REGISTRY_IMAGE/env base-env-image
	- docker build --build-arg SEARXNG_GIT_VERSION="${CI_COMMIT_TAG}" -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .		- docker build --build-arg SEARXNG_GIT_VERSION="${CI_COMMIT_TAG}" -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
	- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG		- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
	only:		only:
	- tags		- tags

	test:unit:		test:unit:
			image: $CI_REGISTRY_IMAGE:master
	stage: test		stage: test
	script:		script:
	- ./manage test.coverage		- ./manage test.coverage

Dockerfile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -64,7 +64,7 @@ RUN su searxng -c "/usr/bin/python3 -m compileall -q searx" \
	# Keep these arguments at the end to prevent redundant layer rebuilds		# Keep these arguments at the end to prevent redundant layer rebuilds
	ARG LABEL_DATE=		ARG LABEL_DATE=
	ARG GIT_URL=unknown		ARG GIT_URL=unknown
	ARG SEARXNG_GIT_VERSION=unknown		ARG SEARXNG_GIT_VERSION=1.0.0
	ARG LABEL_VCS_REF=		ARG LABEL_VCS_REF=
	ARG LABEL_VCS_URL=		ARG LABEL_VCS_URL=