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 installer on Docker #2

Merged
merged 58 commits into from
Nov 21, 2019
Merged

Build installer on Docker #2

merged 58 commits into from
Nov 21, 2019

Conversation

hadim
Copy link
Member

@hadim hadim commented Nov 15, 2019

First try.

.travis.yml Outdated Show resolved Hide resolved
.travis.yml Outdated Show resolved Hide resolved
Dockerfile.amd64 Outdated Show resolved Hide resolved
@hadim
Copy link
Member Author

hadim commented Nov 15, 2019

LGTM for me. There is one remaining point that we can address later because it needs an upstream fix: conda-forge/docker-images#122

Once merged into master, someone should tag a first release (maybe < than 1.0 to begin with).

@isuruf
Copy link
Member

isuruf commented Nov 15, 2019

We should wait on tagging a release and publishing it.

@hmaarrfk
Copy link
Contributor

Agreed, I should have just asked hadim to fork off my working branch. Don't know why I didn't think of that.

Copy link
Contributor

@hmaarrfk hmaarrfk left a comment

Choose a reason for hiding this comment

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

I think we should comment out the power and x86 platforms.

.travis.yml Outdated Show resolved Hide resolved
.travis.yml Outdated Show resolved Hide resolved
@hadim
Copy link
Member Author

hadim commented Nov 15, 2019

Currently, there is an issue with conda complaining about a missing tqdm on aarch64 when executing conda update/install. I am trying to reproduce the bug on Travis. It does not happen on the amd64 installer.

Miniforge3/construct.yaml Outdated Show resolved Hide resolved
@hadim
Copy link
Member Author

hadim commented Nov 18, 2019

For versioning, I think we should do it ourselves in the git tag of this repo:

git tag 4.7.11-0

Then the build script picks it up with $(git describe).

@hadim
Copy link
Member Author

hadim commented Nov 18, 2019

Or so we're all good with channels?

@isuruf
Copy link
Member

isuruf commented Nov 18, 2019

Yes, the channels are good. Does the installer use the conda version given $(git describe)?

@hadim
Copy link
Member Author

hadim commented Nov 18, 2019

@hadim
Copy link
Member Author

hadim commented Nov 18, 2019

oh no sorry, I misunderstood your question.

@hadim
Copy link
Member Author

hadim commented Nov 18, 2019

Something like that at the beginning of the build script:

CONDA_VERSION=$(git tag --points-at HEAD)
# example: CONDA_VERSION="4.7.11-0"
if [ -z "$CONDA_VERSION" ]
then
  echo "***** No Conda version detected in git tag.*****"
else
  CONDA_VERSION=$(echo $CONDA_VERSION | cut -d "-" -f 1)
  echo "***** Conda version detected in git tag: $CONDA_VERSION *****"
  echo "Install appropriate conda version."
  conda install -y "conda=$CONDA_VERSION"
fi

@hadim
Copy link
Member Author

hadim commented Nov 18, 2019

We should test it on master once merged (we can always remove tags if something goes wrong)

@hadim
Copy link
Member Author

hadim commented Nov 18, 2019

and then we read it in build.sh? That would be simpler actually.

@isuruf
Copy link
Member

isuruf commented Nov 18, 2019

I meant, reading from git version and then adding that version constraint to construct.yaml.

@hadim
Copy link
Member Author

hadim commented Nov 18, 2019

What do you think about setting the version in construct.yaml manually and then in the build script:

MINIFORGE_VERSION=$(cat Miniforge/construct.yaml | grep version | cut -d ":" -f 2)
CONDA_VERSION=$(echo $MINIFORGE_VERSION | cut -d "-" -f 1)

echo "***** Install conda version: $CONDA_VERSION *****"
conda install -y "conda=$CONDA_VERSION"

@hadim
Copy link
Member Author

hadim commented Nov 18, 2019

Once in master we tag whatever we want (MINIFORGE_VERSION would be better ofc) to get the build uploaded.

@hadim
Copy link
Member Author

hadim commented Nov 18, 2019

If we get the version from tags, it's weird because it's harder to update conda version from a PR.

@isuruf
Copy link
Member

isuruf commented Nov 18, 2019

What I'm saying is you need,

name: Miniforge
version: 4.7.11-0

channels:
  - https://conda.anaconda.org/conda-forge
  # This will continue to be a dependency until the compilers are
  # moved to conda-forge.
  - https://conda.anaconda.org/c4aarch64   [linux-aarch64]
write_condarc: True
license_file: ../LICENSE
specs:
  - python >=3,<3.8
  - conda 4.7.11
  - pip

Note the version on conda.

@hadim
Copy link
Member Author

hadim commented Nov 18, 2019

Of course, it's even simpler that way :-)

Miniforge/construct.yaml Outdated Show resolved Hide resolved
Copy link
Contributor

@hmaarrfk hmaarrfk left a comment

Choose a reason for hiding this comment

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

Looks great. Two small questions

Miniforge3/construct.yaml Show resolved Hide resolved
scripts/build.sh Outdated Show resolved Hide resolved
@hadim
Copy link
Member Author

hadim commented Nov 19, 2019

This PR starts to be very long. After you've reviewed my last commits, I would like to merge this into master. As long as there is not tag nothing will be released anyway. What do you guys think?

@hmaarrfk
Copy link
Contributor

I'm good with that

@hadim
Copy link
Member Author

hadim commented Nov 21, 2019

@isuruf are you good if we merge this?

@isuruf isuruf merged commit d86c3a3 into conda-forge:master Nov 21, 2019
@hadim hadim deleted the docker branch November 21, 2019 00:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants