Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
senpy
senpy
Commits
7a8abf18
Commit
7a8abf18
authored
Jun 15, 2018
by
J. Fernando Sánchez
Browse files
Update makefiles
parents
a964e586
a21ce0d9
Changes
3
Show whitespace changes
Inline
Side-by-side
.makefiles/docker.mk
View file @
7a8abf18
IMAGENAME
?=
$(NAME)
ifndef
IMAGENAME
ifdef
CI_REGISTRY_IMAGE
IMAGENAME
=
$(CI_REGISTRY_IMAGE)
else
IMAGENAME
=
$(NAME)
endif
endif
IMAGEWTAG
?=
$(IMAGENAME)
:
$(VERSION)
DOCKER_FLAGS
?=
$
(
-ti
)
DOCKER_CMD
?=
docker-login
:
##
Log in to the registry. It will only be used in the server
,
or when running a CI task locally (if CI_BUILD_TOKEN is set).
ifeq
($(CI_BUILD_TOKEN),)
...
...
@@ -19,6 +28,19 @@ else
@
docker
logout
endif
docker-run
:
##
Build a generic docker image
docker run
$(DOCKER_FLAGS)
$(IMAGEWTAG)
$(DOCKER_CMD)
docker-build
:
##
Build a generic docker image
docker build
.
-t
$(IMAGEWTAG)
docker-push
:
docker-login
##
Push a generic docker image
docker push
$(IMAGEWTAG)
docker-latest-push
:
docker-login
##
Push the latest image
docker tag
$(IMAGEWTAG)
$(IMAGENAME)
docker push
$(IMAGENAME)
login
::
docker-login
clean
::
docker-clean
...
...
.makefiles/git.mk
View file @
7a8abf18
...
...
@@ -14,7 +14,7 @@ push-github: ## Push the code to github. You need to set up GITHUB_DEPLOY_KEY
ifeq
($(GITHUB_DEPLOY_KEY),)
else
$(
eval
KEY_FILE :
=
"
$(
shell
mktemp
)
"
)
@
echo
"
$(GITHUB_DEPLOY_KEY)
"
>
$(KEY_FILE)
@
printf
'%b'
'
$(GITHUB_DEPLOY_KEY)
'
>
$(KEY_FILE)
@
git remote
rm
github-deploy
||
true
git remote add github-deploy
$(GITHUB_REPO)
-
@GIT_SSH_COMMAND
=
"ssh -i
$(KEY_FILE)
"
git fetch github-deploy
$(CI_COMMIT_REF_NAME)
...
...
.makefiles/k8s.mk
View file @
7a8abf18
...
...
@@ -13,7 +13,7 @@
KUBE_CA_TEMP
=
false
ifndef
KUBE_CA_PEM_FILE
KUBE_CA_PEM_FILE
:=
$$
PWD/.ca.crt
CREATED
:=
$(
shell
echo
-e
"
$(KUBE_CA_BUNDLE)
"
>
$(KUBE_CA_PEM_FILE)
)
CREATED
:=
$(
shell
printf
'%b\n'
'
$(KUBE_CA_BUNDLE)
'
>
$(KUBE_CA_PEM_FILE)
)
endif
KUBE_TOKEN
?=
""
KUBE_NAMESPACE
?=
$(NAME)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment