Skip to content

Commit

Permalink
Update Docker CE to support dual-logging (#4799)
Browse files Browse the repository at this point in the history
Signed-off-by: Leonid Brandes <leonidb@fb.com>
  • Loading branch information
interfan7 committed Feb 8, 2021
1 parent 037f03e commit 857c845
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 7 deletions.
9 changes: 3 additions & 6 deletions xwf/gateway/deploy/roles/docker/tasks/main.yml
Expand Up @@ -30,10 +30,9 @@
- name: Add the stable repository for Docker
shell: yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo

- name: Install the latest version of Docker CE
yum:
name: docker-ce
state: present
- name: Install Docker CE
include_role:
name: docker_ce_update

- name: Install Docker compose
become: true
Expand All @@ -50,5 +49,3 @@

- name: start docker service
systemd: name=docker state=started enabled=yes


20 changes: 20 additions & 0 deletions xwf/gateway/deploy/roles/docker_ce_update/tasks/main.yml
@@ -0,0 +1,20 @@
---
#
# Copyright 2020 The Magma Authors.

# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.

# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License

- name: install docker-ce
yum:
name:
- docker-ce-20.10.3-3.el7
- docker-ce-cli-20.10.3-3.el7
state: present
allow_downgrade: yes # pin to a version even if the installed docker-ce is newer
3 changes: 2 additions & 1 deletion xwf/gateway/deploy/upgrade.yml
Expand Up @@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License

- name: Set up Express Wi-FI Magma Gateway for production
- name: Upgrade Express Wi-FI Magma Gateway for production
hosts: localhost
become: yes
roles:
Expand All @@ -21,6 +21,7 @@
- fbstatsd
- role: dhcpd
when: uplink_if is none
- role: docker_ce_update
- role: containers
- role: exporter
- role: fbstatsd
Expand Down

0 comments on commit 857c845

Please sign in to comment.