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

build-docker.sh updated to allow for empty PIGEN_DOCKER_OPTS #522

Merged
merged 1 commit into from
Jun 17, 2021

Conversation

DBongiorno-CG
Copy link
Contributor

Added simple catch for default case in which PIGEN_DOCKER_OPTS is unspecified during docker build

@XECDesign
Copy link
Member

What impact does this PR have? As far as I can tell, there's no difference between a variable being empty and it being unset, in this case.

@DBongiorno-CG
Copy link
Contributor Author

DBongiorno-CG commented Jun 17, 2021

Hello! Fair point, I guess they are equivalent in that sense - I could've worded the initial commit a bit better. The intent of this PR was to still allow for a default docker build should a user not specify any additional PIGEN_DOCKER_OPTS.

@XECDesign
Copy link
Member

I guess I don't understand what you mean by 'allow' in this sense. It still works whether or not the user sets the variable or not as is, right?

@DBongiorno-CG
Copy link
Contributor Author

It did not - when I pulled the repo the other day and ran ./build-docker.sh for my project I received the following:

./build-docker.sh: line 90: PIGEN_DOCKER_OPTS: unbound variable

So I added a statement in that script to set PIGEN_DOCKER_OPTS to a value of "" if unspecified by the user.

@XECDesign
Copy link
Member

Oh right, look like the author of this script passes the -u argument which results in this behaviour. Makes perfect sense, thank you.

@XECDesign XECDesign merged commit 54e1bb4 into RPi-Distro:master Jun 17, 2021
Aalococo pushed a commit to ConsolinnoEnergy/pi-gen that referenced this pull request Jan 27, 2022
update: WPA_COUNTRY

feature: menderize added

Update Dockerfile

Revert "Update Dockerfile"

This reverts commit 44edfed.

feature: add nmap package

feature: added menderize script

git: add mender_work to gitignore

update: menderize script fixed and added to readme

fix: menderize

Revert "feature: menderize added"

This reverts commit 0b0b559.

update: add build mendercontainer

fix: chmod changed

update: motd sudo ping

update: motd

update: added leaflet cli to image

fix: remove sudo from motd

update: remove ping from motd

fix: typo in ssh command

fix: ssh folder

refactor: mende_work to dockerignore

feature: Nymea stage with updated nymea package list

update: menderize script

Customized mender.conf creation script is now used

refactor: motd

fix: package list is now updated after new repos are added

feature: update nymea

added nymea experimental repo and updated packagelist

feature: syslog forward deactivted

journalctl will no longer forward logs to syslog(safes discspace)

feature: leaflet-hotspot manager added

feature: Img Version number added

feature: menderize exit codes

added return errors to exits in script

fix: naming

feature: moved menderize script to Imagebuilder

feature: identity added

feature: add Image Version to motd

refactor: img name changed

feature: InstalledPackages.list added

update: version string

feature: motd update

feature: leaflet.info added

feature: filename changed

feature: added IMG_VERSION as input for build.sh

refactor: added comments

feature: added image version

reafactor: removed breaking comments

fix: leaflet.info added

Update release notes

Added PIGEN_DOCKER_OPTS to  build-docker.sh (RPi-Distro#521)

Update Beginner's Guide download link

Added simple catch for default case in which PIGEN_DOCKER_OPTS is unspecified during docker build (RPi-Distro#522)

Fix: update dependencies (RPi-Distro#526)

Copy debootstrap.log on failure

Fix broken imagetool.sh --mount (RPi-Distro#529)

fix: leaflet.info

feature: image name updated

Revert "feature: image name updated"

This reverts commit e436240.

update: imgname in config

refactor: commented

feature: moved package list to own stage

feature: updated Image Info file

update: info and releaseontes

fix: finalize stage

feature: added wifi ip to hotspot settings

refactor: motd.sh

feature: leaf user no password

refactor: convert Image version format in info file

ci: removed gitlab yml

feature: leaflet-hotspot now shows more status info

fix: removed various bugs in Hotspot script

docs: update release notes

update: .info file updated

ci: Info file update

feature: added openvpn package

feature: network settings to data partition

fix: fix local config for leaflet hotspot

fix: typo in hotspot

feature: hotspot now has last 4 digits of serial number

feature: networkmanager WIFI only if password was set

feature:  add hostname change to hotspot tool

feature: hostname and hotspot refactor

refactor: updated Hotspot and Network stage

feature: leaflet-configure added

feauter: leaflet-configure fixed

fix: motd not using base software anymore

feature: added python pip3 package

feature: skipping nymea stage

fix: leaflet-wizzard password to json

fix: change owner of .ssh folder

feature: added network manager

feature: purge conflicts with network manager

fixed: hotspot service after network manager

remove: root password

feature: remove leaf user, only ssh key

fix: removed SKIPs

feature: no hotspot at default

feature: leaflet-network

Leaflet-hotpsot is now named leaflet-network and holds options for wired connection

fix: typo in leaflet-network

feature: hems and cems test

fix: typo

feature: update nymea package list

feature: added cems stage

update .info file

update leaflet-network to 0.2

feature: added live repo
SRaus pushed a commit to analogdevicesinc/adi-kuiper-gen that referenced this pull request Feb 28, 2022
SRaus pushed a commit to analogdevicesinc/adi-kuiper-gen that referenced this pull request Mar 1, 2022
scuciurean pushed a commit to analogdevicesinc/adi-kuiper-gen that referenced this pull request Mar 23, 2022
…pecified during docker build (RPi-Distro#522)

(cherry picked from commit 54e1bb4)
wandering-andy pushed a commit to wandering-andy/pi-gen that referenced this pull request Oct 15, 2023
UmeshMohan-Dozee pushed a commit to DozeeRnD/pi-gen that referenced this pull request Sep 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants