Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
Odoo scripts
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Container Registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
XCG
Odoo scripts
Commits
0ea60be9
Commit
0ea60be9
authored
1 year ago
by
Vincent Hatakeyama
Browse files
Options
Downloads
Patches
Plain Diff
Remove buildx test and use of buildx
parent
242bd882
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
NEWS.rst
+5
-0
5 additions, 0 deletions
NEWS.rst
odoo_scripts/docker_build.py
+9
-19
9 additions, 19 deletions
odoo_scripts/docker_build.py
with
14 additions
and
19 deletions
NEWS.rst
+
5
−
0
View file @
0ea60be9
...
@@ -2,6 +2,11 @@
...
@@ -2,6 +2,11 @@
History
History
=======
=======
21.0.5
------
Avoid docker.buildx.is_installed() as it reports installation even if it is not installed.
21.0.4
21.0.4
------
------
...
...
This diff is collapsed.
Click to expand it.
odoo_scripts/docker_build.py
+
9
−
19
View file @
0ea60be9
...
@@ -22,5 +22,5 @@
...
@@ -22,5 +22,5 @@
_logger
=
logging
.
getLogger
(
__name__
)
_logger
=
logging
.
getLogger
(
__name__
)
__version__
=
"
1.6.
0
"
__version__
=
"
1.6.
1
"
__date__
=
"
2018-04-04
"
__date__
=
"
2018-04-04
"
...
@@ -26,5 +26,5 @@
...
@@ -26,5 +26,5 @@
__date__
=
"
2018-04-04
"
__date__
=
"
2018-04-04
"
__updated__
=
"
2023-1
0-31
"
__updated__
=
"
2023-1
1-16
"
def
add_build_options
(
parser
:
argparse
.
ArgumentParser
):
def
add_build_options
(
parser
:
argparse
.
ArgumentParser
):
...
@@ -250,23 +250,13 @@
...
@@ -250,23 +250,13 @@
_logger
.
debug
(
"
Docker Pull %s
"
,
pull
)
_logger
.
debug
(
"
Docker Pull %s
"
,
pull
)
full_tags
=
[
repository
]
if
nmspc
.
local
else
[
f
"
{
repository
}
:
{
tag
}
"
for
tag
in
tags
]
full_tags
=
[
repository
]
if
nmspc
.
local
else
[
f
"
{
repository
}
:
{
tag
}
"
for
tag
in
tags
]
with
capture_docker_exit_code
()
as
exit_code
:
with
capture_docker_exit_code
()
as
exit_code
:
if
docker
.
buildx
.
is_installed
():
docker
.
image
.
build
(
_logger
.
info
(
"
Starting build with buildx
"
)
context_path
=
"
.
"
,
docker
.
buildx
.
build
(
pull
=
pull
,
context_path
=
"
.
"
,
build_args
=
buildargs
,
pull
=
pull
,
tags
=
full_tags
,
build_args
=
buildargs
,
file
=
dockerfile
,
tags
=
full_tags
,
)
file
=
dockerfile
,
)
else
:
docker
.
image
.
build
(
context_path
=
"
.
"
,
pull
=
pull
,
build_args
=
buildargs
,
tags
=
full_tags
,
file
=
dockerfile
,
)
if
dev
:
if
dev
:
call
([
"
rm
"
,
dockerfile
])
call
([
"
rm
"
,
dockerfile
])
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment