Skip to content

fix(compose-ng): adding arm64 to osarchmap#270

Merged
noelmcloughlin merged 1 commit intosaltstack-formulas:masterfrom
japtain-cack:nsnow/arm64
Dec 18, 2020
Merged

fix(compose-ng): adding arm64 to osarchmap#270
noelmcloughlin merged 1 commit intosaltstack-formulas:masterfrom
japtain-cack:nsnow/arm64

Conversation

@japtain-cack
Copy link
Contributor

@japtain-cack japtain-cack commented Dec 17, 2020

PR progress checklist (to be filled in by reviewers)

  • Changes to documentation are appropriate (or tick if not required)
  • Changes to tests are appropriate (or tick if not required)
  • Reviews completed

What type of PR is this?

Primary type

  • [build] Changes related to the build system
  • [chore] Changes to the build process or auxiliary tools and libraries such as documentation generation
  • [ci] Changes to the continuous integration configuration
  • [feat] A new feature
  • [fix] A bug fix
  • [perf] A code change that improves performance
  • [refactor] A code change that neither fixes a bug nor adds a feature
  • [revert] A change used to revert a previous commit
  • [style] Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)

Secondary type

  • [docs] Documentation changes
  • [test] Adding missing or correcting existing tests

Does this PR introduce a BREAKING CHANGE?

No.

Related issues and/or pull requests

Describe the changes you're proposing

Adding missing support for arm64 osarch. I'm encountering this issue on Raspberry 4 running Ubuntu server 20.04.

Pillar / config required to test the proposed changes

None

Debug log showing how the proposed changes work

It fixes this. Notice in the Error: HTTP 404 below, the double // in the URL. This was caused by a missing osarch map.

pi01.example.org:
----------
          ID: docker-software-docker-archive-install
    Function: pkg.installed
        Name: gnupg-agent
      Result: True
     Comment: The following packages were installed/updated: gnupg-agent
     Started: 06:12:55.941925
    Duration: 13255.256 ms
     Changes:
              ----------
              gnupg-agent:
                  ----------
                  new:
                      2.2.19-3ubuntu2
                  old:
----------
          ID: docker-software-docker-archive-install
    Function: file.directory
        Name: /usr/local/docker-19.03.9/bin/
      Result: True
     Comment: Directory /usr/local/docker-19.03.9/bin updated
     Started: 06:13:15.019028
    Duration: 8.865 ms
     Changes:
              ----------
              /usr/local/docker-19.03.9/bin:
                  New Dir
----------
          ID: docker-software-docker-archive-install
    Function: archive.extracted
        Name: /usr/local/docker-19.03.9/bin/
      Result: False
     Comment: Attempt 1: Returned a result of "False", with the following comment: "Error: HTTP 404: Not Found reading https://download.docker.com/linux/static/stable//docker-19.03.9.tgz"
              Attempt 2: Returned a result of "False", with the following comment: "Error: HTTP 404: Not Found reading https://download.docker.com/linux/static/stable//docker-19.03.9.tgz"
              Error: HTTP 404: Not Found reading https://download.docker.com/linux/static/stable//docker-19.03.9.tgz
     Started: 06:13:15.033115
    Duration: 135909.276 ms
     Changes:
----------
          ID: docker-software-docker-archive-install-symlink-docker
    Function: file.symlink
        Name: /usr/local/bin/docker
      Result: False
     Comment: One or more requisite failed: docker.software.archive.install.docker-software-docker-archive-install
     Started: 06:15:31.080053
    Duration: 0.015 ms
     Changes:
----------
          ID: docker-software-docker-archive-install-symlink-docker-init
    Function: file.symlink
        Name: /usr/local/bin/docker-init
      Result: False
     Comment: One or more requisite failed: docker.software.archive.install.docker-software-docker-archive-install
     Started: 06:15:31.082055
    Duration: 0.008 ms
     Changes:
----------
          ID: docker-software-docker-archive-install-symlink-runc
    Function: file.symlink
        Name: /usr/local/bin/runc
      Result: False
     Comment: One or more requisite failed: docker.software.archive.install.docker-software-docker-archive-install
     Started: 06:15:31.083969
    Duration: 0.007 ms
     Changes:
----------
          ID: docker-software-docker-archive-install-symlink-docker-proxy
    Function: file.symlink
        Name: /usr/local/bin/docker-proxy
      Result: False
     Comment: One or more requisite failed: docker.software.archive.install.docker-software-docker-archive-install
     Started: 06:15:31.085862
    Duration: 0.007 ms
     Changes:
----------
          ID: docker-software-docker-archive-install-symlink-containerd
    Function: file.symlink
        Name: /usr/local/bin/containerd
      Result: False
     Comment: One or more requisite failed: docker.software.archive.install.docker-software-docker-archive-install
     Started: 06:15:31.087726
    Duration: 0.006 ms
     Changes:
----------
          ID: docker-software-docker-archive-install-symlink-ctr
    Function: file.symlink
        Name: /usr/local/bin/ctr
      Result: False
     Comment: One or more requisite failed: docker.software.archive.install.docker-software-docker-archive-install
     Started: 06:15:31.089609
    Duration: 0.006 ms
     Changes:
----------
          ID: docker-software-docker-archive-install-symlink-dockerd
    Function: file.symlink
        Name: /usr/local/bin/dockerd
      Result: False
     Comment: One or more requisite failed: docker.software.archive.install.docker-software-docker-archive-install
     Started: 06:15:31.091476
    Duration: 0.006 ms
     Changes:
----------
          ID: docker-software-docker-archive-install-symlink-containerd-shim
    Function: file.symlink
        Name: /usr/local/bin/containerd-shim
      Result: False
     Comment: One or more requisite failed: docker.software.archive.install.docker-software-docker-archive-install
     Started: 06:15:31.093341
    Duration: 0.006 ms
     Changes:
----------
          ID: docker-software-docker-archive-install-file-directory
    Function: file.directory
        Name: /var/lib/docker
      Result: True
     Comment: Directory /var/lib/docker updated
     Started: 06:15:31.093466
    Duration: 4.938 ms
     Changes:
              ----------
              /var/lib/docker:
                  ----------
                  mode:
                      0755
              mode:
                  0755
----------
          ID: docker-software-docker-archive-install-managed-service
    Function: file.managed
        Name: /usr/lib/systemd/system/dockerd.service
      Result: True
     Comment: File /usr/lib/systemd/system/dockerd.service updated
     Started: 06:15:31.098771
    Duration: 219.256 ms
     Changes:
              ----------
              diff:
                  New file
              mode:
                  0644
----------
          ID: docker-software-docker-archive-install-managed-service
    Function: cmd.run
        Name: systemctl daemon-reload
      Result: False
     Comment: One or more requisite failed: docker.software.archive.install.docker-software-docker-archive-install
     Started: 06:15:31.319622
    Duration: 0.011 ms
     Changes:
----------
          ID: docker-software-service-running-docker
    Function: service.running
        Name: dockerd
      Result: False
     Comment: Service dockerd has been enabled, and is dead
     Started: 06:15:39.898215
    Duration: 10145.322 ms
     Changes:
              ----------
              dockerd:
                  True
----------
          ID: docker-compose-software-binary-install
    Function: file.managed
        Name: /usr/local/docker-compose-latest/bin//docker-compose
      Result: True
     Comment: File /usr/local/docker-compose-latest/bin//docker-compose updated
     Started: 06:15:50.580345
    Duration: 3032.435 ms
     Changes:
              ----------
              diff:
                  New file
              mode:
                  0755
----------
          ID: docker-compose-software-binary-install-symlink-docker-compose
    Function: file.symlink
        Name: /usr/local/bin/docker-compose
      Result: True
     Comment: Created new symlink /usr/local/bin/docker-compose -> /usr/local/docker-compose-latest/bin//docker-compose
     Started: 06:15:53.617060
    Duration: 240.23 ms
     Changes:
              ----------
              new:
                  /usr/local/bin/docker-compose

Summary for pi01.example.org
-------------
Succeeded: 78 (changed=7)
Failed:    11
-------------
Total states run:     89
Total run time:  186.901 s

Documentation checklist

  • Updated the README (e.g. Available states).
  • Updated pillar.example.

Testing checklist

  • Included in Kitchen (i.e. under state_top).
  • Covered by new/existing tests (e.g. InSpec, Serverspec, etc.).
  • Updated the relevant test pillar.

Additional context

Copy link
Contributor

@noelmcloughlin noelmcloughlin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @japtain-cack

@noelmcloughlin
Copy link
Contributor

Could you git commit --amend and change commit message to (say)

feat(arm64): add support for Raspberry Pi 4 running Ubuntu 20.04

@noelmcloughlin noelmcloughlin merged commit 596ee03 into saltstack-formulas:master Dec 18, 2020
@saltstack-formulas-travis

🎉 This PR is included in version 1.1.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants