Add support for x86 devices

ansible/roles/network/tasks/main.yml

@@ -83,7 +83,10 @@
   register: nm_pkla_path
 
 - name: Copy org.freedesktop.NetworkManager.pkla to 50-local.d
-  ansible.builtin.command: cp -f /var/lib/polkit-1/localauthority/10-vendor.d/org.freedesktop.NetworkManager.pkla /etc/polkit-1/localauthority/50-local.d
+  ansible.builtin.shell: |
+    mkdir -p /etc/polkit-1/localauthority/50-local.d
+    cp -f /var/lib/polkit-1/localauthority/10-vendor.d/org.freedesktop.NetworkManager.pkla \
+      /etc/polkit-1/localauthority/50-local.d
   when: manage_network|bool
   changed_when: not nm_pkla_path.stat.exists
 

ansible/roles/system/tasks/main.yml

@@ -99,6 +99,9 @@
 - name: Notice for cmdline.txt.orig file
   ansible.builtin.debug:
     msg: "Use cmdline.txt.orig for boot parameters (don't remove this file)"
+  tags:
+    - touches-boot-partition
+    - raspberry-pi
 
 - name: Copy cmdline.txt.orig to cmdline.txt
   ansible.builtin.copy:
@@ -206,15 +209,28 @@
     update_cache: true
   when: not cdefs_exist
 
-- name: Install Anthias dependencies
+- name: Get architecture
+  ansible.builtin.command: dpkg --print-architecture
+  register: architecture
+  changed_when: false
+
+- name: Install Anthias dependencies (all platforms)
   ansible.builtin.apt:
     name:
-      - rpi-update
       - bc
       - python3
       - python3-redis
     state: present
 
+- name: Install Anthias dependencies (Raspberry Pi)
+  ansible.builtin.apt:
+    name:
+      - rpi-update
+    state: present
+  when: |
+    architecture.stdout == "armhf" or
+    architecture.stdout == "arm64"
+
 - name: Remove deprecated apt dependencies
   ansible.builtin.apt:
     name:
@@ -244,21 +260,30 @@
       - docker-compose
     state: absent
 
-- name: Add docker apt key
+- name: Add Docker apt key (x86)
+  ansible.builtin.apt_key:
+    url: https://download.docker.com/linux/debian/gpg
+    state: present
+  when: architecture.stdout == "amd64"
+
+- name: Add Docker apt key (Raspberry Pi)
   ansible.builtin.apt_key:
     url: https://download.docker.com/linux/raspbian/gpg
     state: present
+  when: |
+    architecture.stdout == "armhf" or
+    architecture.stdout == "arm64"
 
-- name: Get raspbian name
+- name: Get Debian name
   ansible.builtin.command: lsb_release -cs
-  register: raspbian_name
+  register: debian_name
   changed_when: false
 
 - name: Add Docker repo
   ansible.builtin.lineinfile:
     path: /etc/apt/sources.list.d/docker.list
     create: true
-    line: "deb [arch=armhf] https://download.docker.com/linux/debian {{ raspbian_name.stdout }} stable"
+    line: "deb [arch={{ architecture.stdout }}] https://download.docker.com/linux/debian {{ debian_name.stdout }} stable"
     state: present
     owner: root
     group: root
@@ -267,13 +292,28 @@
 - name: Install Docker
   ansible.builtin.apt:
     name:
-      - docker-ce:armhf
-      - docker-ce-cli:armhf
-      - docker-compose-plugin:armhf
+      - docker-ce:{{ architecture.stdout }}
+      - docker-ce-cli:{{ architecture.stdout }}
+      - docker-compose-plugin:{{ architecture.stdout }}
     update_cache: true
     install_recommends: false
 
-- name: Add user to docker group
+- name: Add user to Docker group (all platforms)
+  ansible.builtin.user:
+    name: "{{ lookup('env', 'USER') }}"
+    group: "{{ lookup('env', 'USER') }}"
+    groups:
+      - docker
+      - adm
+      - sudo
+      - video
+      - plugdev
+      - users
+      - input
+      - netdev
+      - dialout
+
+- name: Add user to Docker group (Raspberry Pi)
   ansible.builtin.user:
     name: "{{ lookup('env', 'USER') }}"
     group: "{{ lookup('env', 'USER') }}"
@@ -288,6 +328,9 @@
       - netdev
       - gpio
       - dialout
+  when: |
+    architecture.stdout == "armhf" or
+    architecture.stdout == "arm64"
 
 - name: Perform system upgrade
   ansible.builtin.apt:

bin/build_containers.sh

@@ -80,16 +80,13 @@ for container in ${SERVICES[@]}; do
         export CHROME_DL_URL="https://storage.googleapis.com/chrome-for-testing-public/123.0.6312.86/linux64/chrome-linux64.zip"
         export CHROMEDRIVER_DL_URL="https://storage.googleapis.com/chrome-for-testing-public/123.0.6312.86/linux64/chromedriver-linux64.zip"
     elif [ "$container" == 'wifi-connect' ]; then
-        # We don't support wifi-connect on x86 yet.
-        if [ "$BOARD" == 'x86' ]; then
-            continue
-        fi
-
         # Logic for determining the correct architecture for the wifi-connect container
         if [ "$TARGET_PLATFORM" = 'linux/arm/v6' ]; then
             architecture=rpi
-        else
+        elif [ "$TARGET_PLATFORM" = 'linux/arm/v7' ] || [ "$TARGET_PLATFORM" = 'linux/arm/v8' ]; then
             architecture=armv7hf
+        else
+            architecture=amd64
         fi
 
         wc_download_url='https://api.github.com/repos/balena-os/wifi-connect/releases/93025295'
@@ -114,13 +111,17 @@ for container in ${SERVICES[@]}; do
             SED_ARGS=(-i)
         fi
 
-        sed "${SED_ARGS[@]}" -e '/libraspberrypi0/d' $(find docker/ -maxdepth 1 -not -name "*.tmpl" -type f)
+        PACKAGES_TO_REMOVE=(
+            "libraspberrypi0"
+            "libgst-dev"
+            "libsqlite0-dev"
+            "libsrtp0-dev"
+            "libssl1.1"
+        )
 
-        # Don't build the viewer container if we're on x86
-        if [ "$container" == 'viewer' ]; then
-            echo "Skipping viewer container for x86 builds..."
-            continue
-        fi
+        for package in "${PACKAGES_TO_REMOVE[@]}"; do
+            sed "${SED_ARGS[@]}" -e "/$package/d" $(find docker/ -maxdepth 1 -not -name "*.tmpl" -type f)
+        done
     else
         if [ "$BOARD" == "pi1" ] && [ "$container" == "viewer" ]; then
             # Remove the libssl1.1 from Dockerfile.viewer
@@ -151,11 +152,9 @@ for container in ${SERVICES[@]}; do
             "screenly/anthias-$container:experimental-$GIT_SHORT_HASH-$BOARD"
         )
     else
+        # TODO: Revert changes when the changes are ready to be merged.
         PUSH_ARGS+=(
-            "screenly/anthias-$container:$DOCKER_TAG"
-            "screenly/anthias-$container:$GIT_SHORT_HASH-$BOARD"
-            "screenly/srly-ose-$container:$DOCKER_TAG"
-            "screenly/srly-ose-$container:$GIT_SHORT_HASH-$BOARD"
+            "nicomiguelino/anthias-$container:latest-$BOARD"
         )
     fi
 

bin/install.sh

@@ -7,13 +7,14 @@ set -euo pipefail
 
 BRANCH="master"
 ANSIBLE_PLAYBOOK_ARGS=()
-REPOSITORY="https://github.com/Screenly/Anthias.git"
+REPOSITORY="https://github.com/nicomiguelino/Anthias.git" # TODO: Revert me later.
 ANTHIAS_REPO_DIR="/home/${USER}/screenly"
 GITHUB_API_REPO_URL="https://api.github.com/repos/Screenly/Anthias"
 GITHUB_RELEASES_URL="https://github.com/Screenly/Anthias/releases"
 GITHUB_RAW_URL="https://raw.githubusercontent.com/Screenly/Anthias"
 DOCKER_TAG="latest"
 UPGRADE_SCRIPT_PATH="${ANTHIAS_REPO_DIR}/bin/upgrade_containers.sh"
+ARCHITECTURE=$(uname -m)
 
 INTRO_MESSAGE=(
     "Anthias requires a dedicated Raspberry Pi and an SD card."
@@ -123,15 +124,15 @@ function initialize_locales() {
 function install_packages() {
     display_section "Install Packages via APT"
 
-    RASPBERRY_PI_OS_VERSION=$(lsb_release -rs)
-    APT_INSTALL_ARGS=(
+    local DISTRO_VERSION=$(lsb_release -rs)
+    local APT_INSTALL_ARGS=(
         "git"
         "libffi-dev"
         "libssl-dev"
         "whois"
     )
 
-    if [ "$RASPBERRY_PI_OS_VERSION" -ge 12 ]; then
+    if [ "$DISTRO_VERSION" -ge 12 ]; then
         APT_INSTALL_ARGS+=("python3-full")
     else
         APT_INSTALL_ARGS+=(
@@ -146,8 +147,11 @@ function install_packages() {
         APT_INSTALL_ARGS+=("network-manager")
     fi
 
-    sudo sed -i 's/apt.screenlyapp.com/archive.raspbian.org/g' \
-        /etc/apt/sources.list
+    if [ "$ARCHITECTURE" != "x86_64" ]; then
+        sudo sed -i 's/apt.screenlyapp.com/archive.raspbian.org/g' \
+            /etc/apt/sources.list
+    fi
+
     sudo apt update -y
     sudo apt-get install -y "${APT_INSTALL_ARGS[@]}"
 }
@@ -179,22 +183,28 @@ function install_ansible() {
 
 function run_ansible_playbook() {
     display_section "Run the Anthias Ansible Playbook"
+    BRANCH='x86-support'
 
     sudo -u ${USER} ${SUDO_ARGS[@]} ansible localhost \
         -m git \
-        -a "repo=$REPOSITORY dest=${ANTHIAS_REPO_DIR} version=${BRANCH} force=no"
+        -a "repo=$REPOSITORY dest=${ANTHIAS_REPO_DIR} version=${BRANCH} force=yes"
     cd ${ANTHIAS_REPO_DIR}/ansible
 
+    if [ "$ARCHITECTURE" == "x86_64" ]; then
+        ANSIBLE_PLAYBOOK_ARGS+=("--skip-tags" "raspberry-pi")
+    fi
+
     sudo -E -u ${USER} ${SUDO_ARGS[@]} \
         ansible-playbook site.yml "${ANSIBLE_PLAYBOOK_ARGS[@]}"
 }
 
 function upgrade_docker_containers() {
     display_section "Initialize/Upgrade Docker Containers"
 
-    wget -q \
-        "$GITHUB_RAW_URL/master/bin/upgrade_containers.sh" \
-        -O "$UPGRADE_SCRIPT_PATH"
+    # TODO: Uncomment me later.
+    # wget -q \
+    #     "$GITHUB_RAW_URL/master/bin/upgrade_containers.sh" \
+    #     -O "$UPGRADE_SCRIPT_PATH"
 
     sudo -u ${USER} \
         DOCKER_TAG="${DOCKER_TAG}" \
@@ -371,6 +381,7 @@ function main() {
     install_packages
     install_ansible
     run_ansible_playbook
+
     upgrade_docker_containers
     cleanup
     modify_permissions

bin/upgrade_containers.sh

@@ -20,7 +20,9 @@ if [ -z "$DOCKER_TAG" ]; then
 fi
 
 # Detect Raspberry Pi version
-if grep -qF "Raspberry Pi 4" /proc/device-tree/model; then
+if [ ! -f /proc/device-tree/model ] && [ "$(uname -m)" = "x86_64" ]; then
+    export DEVICE_TYPE="x86"
+elif grep -qF "Raspberry Pi 4" /proc/device-tree/model; then
     export DEVICE_TYPE="pi4"
 elif grep -qF "Raspberry Pi 3" /proc/device-tree/model; then
     export DEVICE_TYPE="pi3"

docker-compose.yml.tmpl

@@ -2,7 +2,7 @@
 
 services:
   anthias-wifi-connect:
-    image: screenly/anthias-wifi-connect:${DOCKER_TAG}-${DEVICE_TYPE}
+    image: nicomiguelino/anthias-wifi-connect:${DOCKER_TAG}-${DEVICE_TYPE}
     build:
       context: .
       dockerfile: docker/Dockerfile.wifi-connect
@@ -21,7 +21,7 @@ services:
         target: /run/dbus/system_bus_socket
 
   anthias-server:
-    image: screenly/anthias-server:${DOCKER_TAG}-${DEVICE_TYPE}
+    image: nicomiguelino/anthias-server:${DOCKER_TAG}-${DEVICE_TYPE}
     build:
       context: .
       dockerfile: docker/Dockerfile.server
@@ -32,8 +32,9 @@ services:
       - LISTEN=0.0.0.0
       - CELERY_BROKER_URL=redis://redis:6379/0
       - CELERY_RESULT_BACKEND=redis://redis:6379/0
-    devices:
-      - "/dev/vchiq:/dev/vchiq"
+    # TODO: Make this conditional.
+    # devices:
+    #   - "/dev/vchiq:/dev/vchiq"
     restart: always
     volumes:
       - resin-data:/data
@@ -46,7 +47,7 @@ services:
       io.balena.features.supervisor-api: '1'
 
   anthias-viewer:
-    image: screenly/anthias-viewer:${DOCKER_TAG}-${DEVICE_TYPE}
+    image: nicomiguelino/anthias-viewer:${DOCKER_TAG}-${DEVICE_TYPE}
     build:
       context: .
       dockerfile: docker/Dockerfile.viewer
@@ -73,7 +74,7 @@ services:
       io.balena.features.supervisor-api: '1'
 
   anthias-websocket:
-    image: screenly/anthias-websocket:${DOCKER_TAG}-${DEVICE_TYPE}
+    image: nicomiguelino/anthias-websocket:${DOCKER_TAG}-${DEVICE_TYPE}
     build:
       context: .
       dockerfile: docker/Dockerfile.websocket
@@ -91,7 +92,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
 
   anthias-celery:
-    image: screenly/anthias-celery:${DOCKER_TAG}-${DEVICE_TYPE}
+    image: nicomiguelino/anthias-celery:${DOCKER_TAG}-${DEVICE_TYPE}
     build:
       context: .
       dockerfile: docker/Dockerfile.celery
@@ -102,8 +103,9 @@ services:
       - HOME=/data
       - CELERY_BROKER_URL=redis://redis:6379/0
       - CELERY_RESULT_BACKEND=redis://redis:6379/0
-    devices:
-      - "/dev/vchiq:/dev/vchiq"
+    # TODO: Make this conditional.
+    # devices:
+    #   - "/dev/vchiq:/dev/vchiq"
     restart: always
     volumes:
       - resin-data:/data
@@ -115,7 +117,7 @@ services:
       io.balena.features.supervisor-api: '1'
 
   redis:
-    image: screenly/anthias-redis:${DOCKER_TAG}-${DEVICE_TYPE}
+    image: nicomiguelino/anthias-redis:${DOCKER_TAG}-${DEVICE_TYPE}
     build:
       context: .
       dockerfile: docker/Dockerfile.redis
@@ -126,7 +128,7 @@ services:
       - redis-data:/var/lib/redis
 
   anthias-nginx:
-    image: screenly/anthias-nginx:${DOCKER_TAG}-${DEVICE_TYPE}
+    image: nicomiguelino/anthias-nginx:${DOCKER_TAG}-${DEVICE_TYPE}
     build:
       context: .
       dockerfile: docker/Dockerfile.nginx

docker/Dockerfile.base.tmpl

@@ -33,6 +33,7 @@ RUN --mount=type=cache,target=/var/cache/apt \
         python3-setuptools \
         python3-simplejson \
         python-is-python3 \
+        sudo \
         sqlite3
 
 # Works around issue with `curl`