Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CSAN
Csan
Commits
34d5591b
Commit
34d5591b
authored
Jun 16, 2020
by
Max Rosin
Browse files
Fix DOCKERIMASES and SWAAGER_IMAGE_BUILD_CMD typos in Makefiles
Fix #12259 Signed-off-by:
Max Rosin
<
git@hackrid.de
>
parent
c5e5e9ec
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
Makefile
Makefile
+4
-4
make/photon/Makefile
make/photon/Makefile
+1
-1
No files found.
Makefile
View file @
34d5591b
...
...
@@ -137,7 +137,7 @@ DOCKERCMD=$(shell which docker)
DOCKERBUILD
=
$(DOCKERCMD)
build
DOCKERRMIMAGE
=
$(DOCKERCMD)
rmi
DOCKERPULL
=
$(DOCKERCMD)
pull
DOCKERIMA
S
ES
=
$(DOCKERCMD)
images
DOCKERIMA
G
ES
=
$(DOCKERCMD)
images
DOCKERSAVE
=
$(DOCKERCMD)
save
DOCKERCOMPOSECMD
=
$(
shell
which docker-compose
)
DOCKERTAG
=
$(DOCKERCMD)
tag
...
...
@@ -304,11 +304,11 @@ SWAGGER_IMAGENAME=goharbor/swagger
SWAGGER_VERSION
=
v0.21.0
SWAGGER
=
$(DOCKERCMD)
run
--rm
-u
$(
shell
id
-u
)
:
$(
shell
id
-g
)
-v
$(BUILDPATH)
:
$(BUILDPATH)
-w
$(BUILDPATH)
${SWAGGER_IMAGENAME}
:
${SWAGGER_VERSION}
SWAGGER_GENERATE_SERVER
=
${SWAGGER}
generate server
--template-dir
=
$(TOOLSPATH)
/swagger/templates
--exclude-main
SWA
A
GER_IMAGE_BUILD_CMD
=
${DOCKERBUILD}
-f
${TOOLSPATH}
/swagger/Dockerfile
--build-arg
SWAGGER_VERSION
=
${SWAGGER_VERSION}
-t
${SWAGGER_IMAGENAME}
:
$(SWAGGER_VERSION)
.
SWA
G
GER_IMAGE_BUILD_CMD
=
${DOCKERBUILD}
-f
${TOOLSPATH}
/swagger/Dockerfile
--build-arg
SWAGGER_VERSION
=
${SWAGGER_VERSION}
-t
${SWAGGER_IMAGENAME}
:
$(SWAGGER_VERSION)
.
SWAGGER_IMAGENAME
:
@
if
[
"
$(
shell
${DOCKERIMA
S
ES}
-q
${SWAGGER_IMAGENAME}
:
$(SWAGGER_VERSION)
2> /dev/null
)
"
==
""
]
;
then
\
${SWA
A
GER_IMAGE_BUILD_CMD}
&&
echo
"build swagger image successfully"
||
(
echo
"build swagger image failed"
&&
exit
1
)
;
\
@
if
[
"
$(
shell
${DOCKERIMA
G
ES}
-q
${SWAGGER_IMAGENAME}
:
$(SWAGGER_VERSION)
2> /dev/null
)
"
==
""
]
;
then
\
${SWA
G
GER_IMAGE_BUILD_CMD}
&&
echo
"build swagger image successfully"
||
(
echo
"build swagger image failed"
&&
exit
1
)
;
\
fi
# $1 the path of swagger spec
...
...
make/photon/Makefile
View file @
34d5591b
...
...
@@ -19,7 +19,7 @@ CURL=$(shell which curl)
DOCKERCMD
=
$(
shell
which docker
)
DOCKERBUILD
=
$(DOCKERCMD)
build
DOCKERRMIMAGE
=
$(DOCKERCMD)
rmi
DOCKERIMA
S
ES
=
$(DOCKERCMD)
images
DOCKERIMA
G
ES
=
$(DOCKERCMD)
images
BASEIMAGENAMESPACE
=
goharbor
# binary
...
...
Write
Preview
Markdown
is supported
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