Skip to content

Commit

Permalink
# remove buildx config
Browse files Browse the repository at this point in the history
  • Loading branch information
czy21 committed Sep 5, 2024
1 parent 43abf24 commit ae9310c
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 20 deletions.
2 changes: 1 addition & 1 deletion server/docker/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def build(self) -> list[str]:
continue
registry_target_tag = self.get_image_tag(registry_target_url, registry_target_dir, rd)
registry_target_tags.append((t, registry_target_tag))
_cmds.append("DOCKER_BUILDKIT=0 docker build --tag {0} --file {1} {2} --pull".format(registry_source_tag, rd.as_posix(), self.role_output_path.as_posix()))
_cmds.append("docker build --tag {0} --file {1} {2} --pull".format(registry_source_tag, rd.as_posix(), self.role_output_path.as_posix()))
_cmds.extend(["docker tag {} {}".format(registry_source_tag, t[1]) for t in registry_target_tags])
if self.args.push:
_cmds.append("docker push {0}".format(registry_source_tag))
Expand Down
2 changes: 0 additions & 2 deletions server/init/playbook-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
tags:
- '{{ param_role_name }}'
- '{{ param_role_name }}-tls'
- "{{ param_role_name }}-buildx"
- "{{ param_role_name }}-compose"
- "{{ param_role_name }}-plugin"
- import_role:
Expand All @@ -47,7 +46,6 @@
tags:
- '{{ param_role_name }}'
- '{{ param_role_name }}-tls'
- "{{ param_role_name }}-buildx"
- "{{ param_role_name }}-compose"
- "{{ param_role_name }}-plugin"

Expand Down
10 changes: 0 additions & 10 deletions server/init/roles/docker/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,6 @@
tags:
- '{{ param_role_name }}'

- name: buildx
shell: |
sudo mkdir -p /etc/buildkit/
sudo cp -rv {{ param_remote_role_path }}/buildkitd.toml /etc/buildkit/buildkitd.toml
sudo -u {{ ansible_user_id }} sh -c "docker buildx ls | grep 'container' -q && docker buildx rm container;docker buildx create --use --bootstrap --name container --driver docker-container --config /etc/buildkit/buildkitd.toml"
tags:
- '{{ param_role_name }}'
- '{{ param_role_name }}-buildx'
- '{{ param_role_name }}-plugin'

- name: compose
shell: |
sudo mkdir -p /usr/local/lib/docker/cli-plugins/
Expand Down
7 changes: 0 additions & 7 deletions server/init/roles/docker/templates/buildkitd.toml

This file was deleted.

0 comments on commit ae9310c

Please sign in to comment.