Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

combined update of depenadbot recomendations #131

Merged
merged 4 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update docker actions and lint fixes
  • Loading branch information
madelen-at-work committed Mar 7, 2024
commit 6ca473ebace912dfdfa9425d7fd6c063bc996dba
6 changes: 3 additions & 3 deletions .github/actions/docker-build-action/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ runs:
using: composite
steps:
- name: Set up Docker buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Set up QEMU
if: ${{ inputs.use_qemu == 'true'}}
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Build image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
with:
context: .
push: false
Expand Down
9 changes: 4 additions & 5 deletions app/postinstallscript.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
#!/bin/sh

# Move the daemon.json file into localdata folder
if [ ! -e localdata/daemon.json ]
then
mv empty_daemon.json localdata/daemon.json
if [ ! -e localdata/daemon.json ]; then
mv empty_daemon.json localdata/daemon.json
else
rm empty_daemon.json
rm empty_daemon.json
fi

# Make sure containerd is started before dockerd and set PATH
cat >> /etc/systemd/system/sdkdockerdwrapper.service << EOF
cat >>/etc/systemd/system/sdkdockerdwrapper.service <<EOF
[Unit]
BindsTo=containerd.service
After=network-online.target containerd.service var-spool-storage-SD_DISK.mount
Expand Down
23 changes: 11 additions & 12 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
#!/bin/sh -eu
case "${1:-}" in
armv7hf|aarch64)
;;
*)
# error
echo "Invalid argument '${1:-}', valid arguments are armv7hf or aarch64"
exit 1
;;
armv7hf | aarch64) ;;
*)
# error
echo "Invalid argument '${1:-}', valid arguments are armv7hf or aarch64"
exit 1
;;
esac

imagetag="${2:-docker-acap:1.0}"

# Build and copy out the acap
docker buildx build --build-arg ACAPARCH="$1" \
--build-arg HTTP_PROXY="${HTTP_PROXY:-}" \
--build-arg HTTPS_PROXY="${HTTPS_PROXY:-}" \
--file Dockerfile \
--no-cache \
--tag "$imagetag" .
--build-arg HTTP_PROXY="${HTTP_PROXY:-}" \
--build-arg HTTPS_PROXY="${HTTPS_PROXY:-}" \
--file Dockerfile \
--no-cache \
--tag "$imagetag" .

docker cp "$(docker create "$imagetag")":/opt/app/ ./build-"$1"
Loading