Skip to content
This repository has been archived by the owner on Dec 3, 2021. It is now read-only.

Removing tags from curriculum #248

Merged
merged 3 commits into from
Aug 6, 2019
Merged

Removing tags from curriculum #248

merged 3 commits into from
Aug 6, 2019

Conversation

Mierdin
Copy link
Member

@Mierdin Mierdin commented Jul 27, 2019

This PR removes all tags from lesson definitions to be compatible with Syringe changes introduced in nre-learning/antidote-core#123.

To minimize the impact of this change, we have pushed a new tag for the existing images (i.e. antidotelabs/vqfx:snap1) at the exact same image ID, but to an image name that doesn't rely on tags for differentiation. So, instead of:

  • antidotelabs/vqfx:snap1
  • antidotelabs/vqfx:snap2
  • antidotelabs/vqfx:snap3

We have:

  • antidotelabs/vqfx-snap1
  • antidotelabs/vqfx-snap2
  • antidotelabs/vqfx-snap3

These images are cryptographically identical to their tagged counterpart, but without the tag, we can now inject the appropriate version at the Syringe level per the new behavior. Both latest and v0.4.0 versions of these images have been identically pushed, so that both production and PTR/selfmedicate can get the images they need.

As a result, this PR changes the lesson files to point to the correct image. NOTE that this is a temporary measure to get the existing curriculum images compatible with the new format. Enhancements to these images to overcome the mac address issue requiring this snapshotting trick are still on the radar.

Signed-off-by: Matt Oswalt <matt@keepingitclassless.net>
@amosialek
Copy link

amosialek commented Jul 30, 2019

Well... Selfmedicate is still downloading vqfx:snap1, vqfx:snqp2 and vqfx:snap3.
Also this PR will make part of docs obsolete
Please consider changing code in abovementioned repos

@Mierdin
Copy link
Member Author

Mierdin commented Jul 30, 2019

@b3115 The docs will definitely get updated before the next release. In between releases, things should be expected to be pretty fluid. Ideally a docs PR should be joined at the hip with the change it describes, but I'm sure we can do better at that.

In addition, after the next release, selfmedicate will be updated accordingly. Note that selfmedicate only downloads those images in advance as a convenience function.

@amosialek
Copy link

amosialek commented Jul 30, 2019

Just set all to container-vqfx for now

This does not state how long it would be. As far as I understand, all lessons which had more than 1 vqfx will be failing. Maybe there should be some kind of warning in the beginning of these lessons

@amosialek
Copy link

Have you tried to launch updated lessons? I've got timeout while loading lesson-12-jsnapy.

@Mierdin
Copy link
Member Author

Mierdin commented Jul 30, 2019

@b3115 Can you please move this conversation to our discord community or perhaps our forums? They're available at https://antidoteproject.readthedocs.io/en/latest/community.html

@amosialek
Copy link

@Mierdin of course I can. The issue is my concerns are about the consequences of this particular PR and they are not referencing any earlier version. I've managed to load lesson-12 several times before and I would like to prevent from merging PR that may cause unexpected behavior (although I understand that currently this lesson doesn't work anyway). Forum thread might be ignored before merge.

@Mierdin Mierdin changed the title WIP Removed all tags WIP - Removing tags from curriculum and standardizing on single image Jul 30, 2019
Signed-off-by: Matt Oswalt <matt@keepingitclassless.net>
@Mierdin Mierdin changed the title WIP - Removing tags from curriculum and standardizing on single image Removing tags from curriculum Aug 4, 2019
Signed-off-by: Matt Oswalt <matt@keepingitclassless.net>
@Mierdin Mierdin merged commit f4dce54 into master Aug 6, 2019
@Mierdin Mierdin deleted the remove-tags branch August 6, 2019 00:42
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants