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

Fix for 3.6.1 #1

Open
wants to merge 46 commits into
base: master
Choose a base branch
from
Open

Fix for 3.6.1 #1

wants to merge 46 commits into from

Conversation

wawrzek
Copy link

@wawrzek wawrzek commented Oct 3, 2021

No description provided.

odidev and others added 30 commits October 22, 2018 22:01
User needs to execute crux-fetch.sh to get rootfs for aarch64.
After this Docker build can be executed with rootfs and Dockerfile.

Signed-off-by: Odidev <[email protected]>
- Crux is moved to 3.4 from 3.1
 - Scripts are modified to handle both AMD64 and AARCH64.

Signed-off-by: Odidev <[email protected]>
As we expand the functionality of `make.sh` it should
ensure things stay neat, tidy and organised.

Signed-off-by: Lee Jones <[email protected]>
Use 2 methods of architecture detection in case one or the other is
not available.  Also, 'dpkg' usually refers to Debian Packaging,
which is not used by this repository.

Signed-off-by: Lee Jones <[email protected]>
Using 8 spaces (or tabs) extends the lines further than they
really need to be.  Also ';;' should be on their own line
according to most examples/conventions.

This will now will save confusion as we start to chop the code
around.

Signed-off-by: Lee Jones <[email protected]>
Taken from the upstream project:

  https://crux.nu/Main/Handbook3-4#ntoc5

Signed-off-by: Lee Jones <[email protected]>
Amalgamate the build scripts and simplify the Dockerfile.

Signed-off-by: Lee Jones <[email protected]>
Signed-off-by: Lee Jones <[email protected]>
Signed-off-by: Lee Jones <[email protected]>
This will require a subsequent step once AArch64 has bootstrapped.

Once a CRUX image is available we'll use that as a base instead.

Signed-off-by: Lee Jones <[email protected]>
Not all future commands will require a version number.

Signed-off-by: Lee Jones <[email protected]>
It is possible to pre-set/export ARCH which will be detected by
the release script.  This should allow versions destined for
different architectures to be built and pushed from one machine.

Note: AArch64 is still in bootstrap mode, thus it is currently
unable to build the x86_64 images since those use 'crux:latest'
as a build platform.  This will be fixed once AArch64
'crux:latest' has been released.

Signed-off-by: Lee Jones <[email protected]>
* Rename 'make.sh' to 'release' for clarity

Signed-off-by: Lee Jones <[email protected]>

* release: Use functions to break up code

As we expand the functionality of `make.sh` it should
ensure things stay neat, tidy and organised.

Signed-off-by: Lee Jones <[email protected]>

* release: Make architecture detection more flexible

Use 2 methods of architecture detection in case one or the other is
not available.  Also, 'dpkg' usually refers to Debian Packaging,
which is not used by this repository.

Signed-off-by: Lee Jones <[email protected]>

* release: Compact indentation and fix style issues

Using 8 spaces (or tabs) extends the lines further than they
really need to be.  Also ';;' should be on their own line
according to most examples/conventions.

This will now will save confusion as we start to chop the code
around.

Signed-off-by: Lee Jones <[email protected]>

* release: Only attempt to remove cruxbuild container if it exists

Signed-off-by: Lee Jones <[email protected]>

* release: Amalgamate testing into the main build script

Signed-off-by: Lee Jones <[email protected]>

* Move processes into version/architecture specific directories

Signed-off-by: Lee Jones <[email protected]>

* Add LICENSE file

Taken from the upstream project:

  https://crux.nu/Main/Handbook3-4#ntoc5

Signed-off-by: Lee Jones <[email protected]>

* Clean-up the process to build the CRUX root filesystem

Amalgamate the build scripts and simplify the Dockerfile.

Signed-off-by: Lee Jones <[email protected]>

* release: Add usage message

Signed-off-by: Lee Jones <[email protected]>

* release: Obtain version via an argument

Signed-off-by: Lee Jones <[email protected]>

* release: Seperate committing to branch

Signed-off-by: Lee Jones <[email protected]>

* crux-fetch: Standardise root filesystem filename for AArch64 and X86_64

Signed-off-by: Lee Jones <[email protected]>

* Remove the media directory

Signed-off-by: Lee Jones <[email protected]>

* release: Unify commiting for all supported architectures

Signed-off-by: Lee Jones <[email protected]>

* release: Unify testing for all supported architectures

Signed-off-by: Lee Jones <[email protected]>

* release: Fix check for existing branch

Signed-off-by: Lee Jones <[email protected]>

* release: Unify building for all supported architectures

This will require a subsequent step once AArch64 has bootstrapped.

Once a CRUX image is available we'll use that as a base instead.

Signed-off-by: Lee Jones <[email protected]>

* release: Silence removal of 'cruxbuild' container

Signed-off-by: Lee Jones <[email protected]>

* release: Add functionality to push committed release branch

Signed-off-by: Lee Jones <[email protected]>

* release: Seperate fetching version from command line

Not all future commands will require a version number.

Signed-off-by: Lee Jones <[email protected]>

* Further compress root filesystem files

Signed-off-by: Lee Jones <[email protected]>

* release: Allow ARCH to be overridden

It is possible to pre-set/export ARCH which will be detected by
the release script.  This should allow versions destined for
different architectures to be built and pushed from one machine.

Note: AArch64 is still in bootstrap mode, thus it is currently
unable to build the x86_64 images since those use 'crux:latest'
as a build platform.  This will be fixed once AArch64
'crux:latest' has been released.

Signed-off-by: Lee Jones <[email protected]>

* release: Add ability to build Docker's Official Images library file

Signed-off-by: Lee Jones <[email protected]>

* release: Allow any version to be pulled - not just the latest

Signed-off-by: Lee Jones <[email protected]>
Lee Jones and others added 16 commits November 15, 2018 08:39
release: Use origin/master as the base for releases
- Whitespaces were a mixture of tabs and spaces, settle for tabs.
- with 3.6.1 there might be 3 numbers in the release
- add definition for vim no to extend tabs (to be consistent)
- it the iso image is in build directory script will avoid downloading
  it
- if the iso image is in build directory script won't download it
- make indention consistent
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